diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-03-26 18:25:01 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-03-27 14:21:45 +0100 |
| commit | eee2000b41234ae9465c314e18bfec1700181f32 (patch) | |
| tree | f39d096c67a6a30e2333356f51d23ec62a01446a | |
| parent | b6649ab5037fb55f78c2606f3d23cea0867cdeaa (diff) | |
| download | ffmpeg-eee2000b41234ae9465c314e18bfec1700181f32.tar.gz | |
mpeg12: Move some ff_mpeg1_* function declarations to a more suitable place
| -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 cf807ec8ff..39c45a59d5 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 893b0ed9a5..58e5136f4d 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -890,8 +890,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 c4ce43fb17..4249691cd6 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 d215a2fe5a..5364acf92a 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 { |