From b2b766914a49c4e3537df3a585e97b98d432edd2 Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Fri, 29 May 2015 19:44:04 +0100
Subject: [PATCH] mpegvideo: mpeg12: Move function declarations
---
libavcodec/mpeg12.h | 6 ++++++
libavcodec/mpegvideo.h | 7 -------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h
index 9132dc3d2d0..4c1578fe1dc 100644
--- a/libavcodec/mpeg12.h
+++ b/libavcodec/mpeg12.h
@@ -71,4 +71,10 @@ 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);
+void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number);
+void ff_mpeg1_encode_mb(MpegEncContext *s, int16_t block[8][64],
+ int motion_x, int motion_y);
+void ff_mpeg1_encode_init(MpegEncContext *s);
+void ff_mpeg1_encode_slice_header(MpegEncContext *s);
+
#endif /* AVCODEC_MPEG12_H */
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 7fd4f1104ff..bb27d06d00d 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -817,13 +817,6 @@ int ff_epzs_motion_search(MpegEncContext * s, int *mx_ptr, int *my_ptr,
int ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index,
int ref_index, int size, int h, int add_rate);
-void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number);
-void ff_mpeg1_encode_mb(MpegEncContext *s,
- int16_t block[8][64],
- int motion_x, int motion_y);
-void ff_mpeg1_encode_init(MpegEncContext *s);
-void ff_mpeg1_encode_slice_header(MpegEncContext *s);
-
extern const uint8_t ff_aic_dc_scale_table[32];
extern const uint8_t ff_h263_chroma_qscale_table[32];
--
GitLab