diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 01:26:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 01:27:02 +0200 |
| commit | 0aba7192e12bb5e4908c957ee593e0ff3d7f7fe4 (patch) | |
| tree | 9d1c9c4e801912c2deebfdc5bb658980317ff09a | |
| parent | fd116b8dfa731122e1b6f8ededf00074940e2848 (diff) | |
| parent | b2b766914a49c4e3537df3a585e97b98d432edd2 (diff) | |
| download | ffmpeg-0aba7192e12bb5e4908c957ee593e0ff3d7f7fe4.tar.gz | |
Merge commit 'b2b766914a49c4e3537df3a585e97b98d432edd2'
* commit 'b2b766914a49c4e3537df3a585e97b98d432edd2':
mpegvideo: mpeg12: Move function declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpeg12.h | 6 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h index b4ebd23fa8..118410f6fd 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 f76e58e7ac..af32ee8e8f 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -857,13 +857,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]; |