diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 15:23:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-08 15:23:56 +0100 |
| commit | c32cc7e3a40d8449a876938655c0d8ac715b2772 (patch) | |
| tree | ef15553d84eb1b6be4f1efe978be846d384ee849 /libavcodec/mpeg12.c | |
| parent | 43c6c1869011a4253841a99693e862ce57ecda5b (diff) | |
| parent | bcd0a7137e4aca0f6f598593b90ca8f338444c51 (diff) | |
Merge commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51'
* commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51':
configure: Add missing h264chroma dependencies to vp5, vp6
Add missing error_resilience includes to files that use ER
Conflicts:
configure
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 9d2743a6df..1e11ea798d 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -28,13 +28,14 @@ #define UNCHECKED_BITSTREAM_READER 1 //#define DEBUG +#include "libavutil/avassert.h" +#include "libavutil/timecode.h" + #include "internal.h" #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" -#include "libavutil/avassert.h" -#include "libavutil/timecode.h" - +#include "error_resilience.h" #include "mpeg12.h" #include "mpeg12data.h" #include "mpeg12decdata.h" |