diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-01 13:12:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-01 13:33:11 +0200 |
| commit | 909f53f2b285bc7dbe77d4690a03f3d114417297 (patch) | |
| tree | 872502c1e1e6e9d7b16b422023f4269ce24d6236 /libavcodec/mjpegenc.h | |
| parent | a97137e9486964918a71f1a760cdcc297bf61b59 (diff) | |
| parent | adcb8392c9b185fd8a91a95fa256d15ab1432a30 (diff) | |
| download | ffmpeg-909f53f2b285bc7dbe77d4690a03f3d114417297.tar.gz | |
Merge commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30'
* commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30':
mjpeg: Split off bits shared by MJPEG and LJPEG encoders
Conflicts:
libavcodec/mjpegenc.c
libavcodec/mjpegenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegenc.h')
| -rw-r--r-- | libavcodec/mjpegenc.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/mjpegenc.h b/libavcodec/mjpegenc.h index 94bb652fba..069d43c816 100644 --- a/libavcodec/mjpegenc.h +++ b/libavcodec/mjpegenc.h @@ -51,16 +51,6 @@ typedef struct MJpegContext { int ff_mjpeg_encode_init(MpegEncContext *s); void ff_mjpeg_encode_close(MpegEncContext *s); -void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb, - ScanTable *intra_scantable, - uint16_t luma_intra_matrix[64], - uint16_t chroma_intra_matrix[64]); -void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits); -void ff_mjpeg_escape_FF(PutBitContext *pb, int start); -void ff_mjpeg_encode_stuffing(MpegEncContext *s); -void ff_mjpeg_init_hvsample(AVCodecContext *avctx, int hsample[3], int vsample[3]); -void ff_mjpeg_encode_dc(PutBitContext *pb, int val, - uint8_t *huff_size, uint16_t *huff_code); void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[12][64]); #endif /* AVCODEC_MJPEGENC_H */ |