diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 11:40:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 11:40:30 +0100 |
| commit | 0f057ea3c5484d7df8a951c1fdeb8b873ae382e2 (patch) | |
| tree | dd8672f17b58a14f57e62437ea8123f77a93f868 /libavcodec/mjpegenc.h | |
| parent | b342ea603f0c767759639a002b9db638231e989c (diff) | |
| parent | 86eb2eaac629909d6ee4067c6f1e485a4e70473d (diff) | |
Merge commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d'
* commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d':
mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_dc()
Conflicts:
libavcodec/mjpegenc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegenc.h')
| -rw-r--r-- | libavcodec/mjpegenc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegenc.h b/libavcodec/mjpegenc.h index 293fe0f948..db79b44c10 100644 --- a/libavcodec/mjpegenc.h +++ b/libavcodec/mjpegenc.h @@ -56,7 +56,7 @@ void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb, uint16_t intra_matrix[64]); void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits); void ff_mjpeg_encode_stuffing(MpegEncContext *s); -void ff_mjpeg_encode_dc(MpegEncContext *s, int val, +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[6][64]); |