summaryrefslogtreecommitdiff
path: root/libavcodec/rv10.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-23 03:48:30 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-23 03:48:30 +0200
commit56afbe8dbc6e508ba279bb95db542b940284fa7d (patch)
tree07d4be3dca4b6f63399a81c59a18867d8212892f /libavcodec/rv10.c
parentca350378de061a43d394dab2a649995f7f83274c (diff)
parent7b9ef8d701c319c26f7d0664fe977e176764c74e (diff)
downloadffmpeg-56afbe8dbc6e508ba279bb95db542b940284fa7d.tar.gz
Merge commit '7b9ef8d701c319c26f7d0664fe977e176764c74e'
* commit '7b9ef8d701c319c26f7d0664fe977e176764c74e': mpeg: Split error resilience bits off into a separate file Conflicts: configure libavcodec/Makefile libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv10.c')
-rw-r--r--libavcodec/rv10.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 3fb94c8ad7..f908a9a13a 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -33,6 +33,7 @@
#include "error_resilience.h"
#include "h263.h"
#include "internal.h"
+#include "mpeg_er.h"
#include "mpegvideo.h"
#include "mpeg4video.h"