mpeg12: Move some ff_mpeg1_* function declarations to a more suitable place

diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h
index cf807ec8ffe2fae8b8c0b70c77ae25c52df1834a..39c45a59d5c92e672b08df18b312e402dba1e898 100644 (file)
--- 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 893b0ed9a5271f5fdebd1d0aa1c2658aa0c49066..58e5136f4d20762c667315aae5b928dad837c6b3 100644 (file)
--- 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 c4ce43fb179ec427b91df1ffdaf373aee49b2de5..4249691cd6d475057bb07e8f4bb524b99d152f4a 100644 (file)
--- 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 d215a2fe5aa59b5efd4aba599d453d844176a57d..5364acf92a18fa4fce03c22380692323d8b8bc69 100644 (file)
--- 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 {