diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 11:30:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 11:30:29 +0100 |
| commit | 385ffc7650d2661b651f466f18045c2edc30b11a (patch) | |
| tree | 6957fc3126be331eea4d62e2ce0c7a0f1670f250 /libavcodec/mpegvideo_parser.c | |
| parent | 63a97d56748a5deaaf5b9c26ac49f5086a8cceeb (diff) | |
| parent | eee2000b41234ae9465c314e18bfec1700181f32 (diff) | |
Merge commit 'eee2000b41234ae9465c314e18bfec1700181f32'
* commit 'eee2000b41234ae9465c314e18bfec1700181f32':
mpeg12: Move some ff_mpeg1_* function declarations to a more suitable place
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo_parser.c')
| -rw-r--r-- | libavcodec/mpegvideo_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c index 2b1133a6fd..d36bc7af1e 100644 --- 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 { |