Merge commit 'eee2000b41234ae9465c314e18bfec1700181f32'

* commit 'eee2000b41234ae9465c314e18bfec1700181f32': mpeg12: Move some ff_mpeg1_* function declarations to a more suitable place Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 11:30:21 +01:00
parent 63a97d5674 eee2000b41
commit 385ffc7650
4 changed files with 4 additions and 3 deletions
--- a/libavcodec/mpegvideo_parser.c
+++ b/libavcodec/mpegvideo_parser.c
@@ -21,7 +21,7 @@
 */

 #include "parser.h"
-#include "mpegvideo.h"
+#include "mpeg12.h"
 #include "internal.h"

 struct MpvParseContext {