From eee2000b41234ae9465c314e18bfec1700181f32 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Tue, 26 Mar 2013 18:25:01 +0100
Subject: [PATCH] mpeg12: Move some ff_mpeg1_* function declarations to a more
 suitable place

---
 libavcodec/mpeg12.h           | 2 ++
 libavcodec/mpegvideo.h        | 2 --
 libavcodec/mpegvideo_enc.c    | 1 +
 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 {