aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/rv34.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-08 15:23:56 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-08 15:23:56 +0100
commitc32cc7e3a40d8449a876938655c0d8ac715b2772 (patch)
treeef15553d84eb1b6be4f1efe978be846d384ee849 /libavcodec/rv34.c
parent43c6c1869011a4253841a99693e862ce57ecda5b (diff)
parentbcd0a7137e4aca0f6f598593b90ca8f338444c51 (diff)
downloadffmpeg-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/rv34.c')
-rw-r--r--libavcodec/rv34.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index 462cef91ad..31e5d03332 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -28,6 +28,7 @@
#include "libavutil/internal.h"
#include "avcodec.h"
+#include "error_resilience.h"
#include "mpegvideo.h"
#include "golomb.h"
#include "internal.h"