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/mss2.c | |
| parent | 43c6c1869011a4253841a99693e862ce57ecda5b (diff) | |
| parent | bcd0a7137e4aca0f6f598593b90ca8f338444c51 (diff) | |
| download | ffmpeg-c32cc7e3a40d8449a876938655c0d8ac715b2772.tar.gz | |
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/mss2.c')
| -rw-r--r-- | libavcodec/mss2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index afdf33c244..71bd0b858b 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -24,6 +24,7 @@ */ #include "libavutil/avassert.h" +#include "error_resilience.h" #include "internal.h" #include "msmpeg4data.h" #include "vc1.h" |