diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-02-18 00:05:13 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-02-18 00:05:13 -0500 |
| commit | f13212b72817ec5e8ec90f8375b98d1515eab27b (patch) | |
| tree | c5cb709d408e0f9ef451c78a90a213ac3165753b /vp8/decoder/decodemv.c | |
| parent | 95a86dd007ee53170a25e8406c1d09e40cdbe78a (diff) | |
| parent | b2ae57f1b6cbbf018d356528bd8e816752dbbfb7 (diff) | |
| download | libvpx-f13212b72817ec5e8ec90f8375b98d1515eab27b.tar libvpx-f13212b72817ec5e8ec90f8375b98d1515eab27b.tar.gz libvpx-f13212b72817ec5e8ec90f8375b98d1515eab27b.tar.bz2 libvpx-f13212b72817ec5e8ec90f8375b98d1515eab27b.zip | |
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/decoder/decodemv.c')
| -rw-r--r-- | vp8/decoder/decodemv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vp8/decoder/decodemv.c b/vp8/decoder/decodemv.c index 415392b68..d67cb54fa 100644 --- a/vp8/decoder/decodemv.c +++ b/vp8/decoder/decodemv.c @@ -10,10 +10,10 @@ #include "treereader.h" -#include "entropymv.h" -#include "entropymode.h" +#include "vp8/common/entropymv.h" +#include "vp8/common/entropymode.h" #include "onyxd_int.h" -#include "findnearmv.h" +#include "vp8/common/findnearmv.h" #if CONFIG_DEBUG #include <assert.h> |