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 | |
| parent | 63a97d56748a5deaaf5b9c26ac49f5086a8cceeb (diff) | |
| parent | eee2000b41234ae9465c314e18bfec1700181f32 (diff) | |
| download | ffmpeg-385ffc7650d2661b651f466f18045c2edc30b11a.tar.gz | |
Merge commit 'eee2000b41234ae9465c314e18bfec1700181f32'
* commit 'eee2000b41234ae9465c314e18bfec1700181f32':
mpeg12: Move some ff_mpeg1_* function declarations to a more suitable place
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpeg12.h | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 1 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_parser.c | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index 87ccfa811e..e4c3b6f78b 100644 --- a/libavcodec/mpeg12.h +++ b/libavcodec/mpeg12.h @@ -72,5 +72,7 @@ static inline int decode_dc(GetBitContext *gb, int component) } int ff_mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, int n); +void ff_mpeg1_clean_buffers(MpegEncContext *s); +int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, AVCodecParserContext *s); #endif /* AVCODEC_MPEG12_H */ diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 46470df6ca..addbde0292 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -913,8 +913,6 @@ void ff_mpeg1_encode_mb(MpegEncContext *s, int motion_x, int motion_y); void ff_mpeg1_encode_init(MpegEncContext *s); void ff_mpeg1_encode_slice_header(MpegEncContext *s); -void ff_mpeg1_clean_buffers(MpegEncContext *s); -int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size, AVCodecParserContext *s); extern const uint8_t ff_aic_dc_scale_table[32]; extern const uint8_t ff_h263_chroma_qscale_table[32]; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index dd6694300e..411b7dfa9e 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -35,6 +35,7 @@ #include "avcodec.h" #include "dct.h" #include "dsputil.h" +#include "mpeg12.h" #include "mpegvideo.h" #include "h263.h" #include "mathops.h" 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 { |