diff options
| author | John Koleszar <jkoleszar@google.com> | 2012-12-21 15:20:41 -0800 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2012-12-27 09:37:19 -0800 |
| commit | 16810c10c1fbe3bb55b3da28a5bb37fe1c184af9 (patch) | |
| tree | 2b5ddbabd155216da43baf137eee93b6fba7eb60 /vp8/decoder/threading.c | |
| parent | b9ce43029298182668d4dcb0e0814189e4a63c2a (diff) | |
| parent | 5ebe94f9f148693a34bc861ef97a7fff6fc38251 (diff) | |
| download | libvpx-16810c10c1fbe3bb55b3da28a5bb37fe1c184af9.tar libvpx-16810c10c1fbe3bb55b3da28a5bb37fe1c184af9.tar.gz libvpx-16810c10c1fbe3bb55b3da28a5bb37fe1c184af9.tar.bz2 libvpx-16810c10c1fbe3bb55b3da28a5bb37fe1c184af9.zip | |
Merge branch 'vp9-preview' of review:webm/libvpx
Merge the vp9-preview branch into master.
Change-Id: If700b9054676f24bed9deb59050af546c1ca5296
Diffstat (limited to 'vp8/decoder/threading.c')
| -rw-r--r-- | vp8/decoder/threading.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c index 88c06be3e..b18cb5065 100644 --- a/vp8/decoder/threading.c +++ b/vp8/decoder/threading.c @@ -10,7 +10,7 @@ #include "vpx_config.h" -#include "vpx_rtcd.h" +#include "vp8_rtcd.h" #if !defined(WIN32) && CONFIG_OS_SUPPORT == 1 # include <unistd.h> #endif |