RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'eee2000b41234ae9465c314e18bfec1700181f32' 

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-28 11:30:21 +01:00
parent 63a97d5674 eee2000b41
commit 385ffc7650
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/mpeg12.h
View File

@ -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 */

2
libavcodec/mpegvideo.h
View File

@ -913,8 +913,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];

1
libavcodec/mpegvideo_enc.c
View File

@ -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"

2
libavcodec/mpegvideo_parser.c
View File

@ -21,7 +21,7 @@
*/
#include "parser.h"
#include "mpegvideo.h"
#include "mpeg12.h"
#include "internal.h"
struct MpvParseContext {