diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 11:33:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 11:33:07 +0100 |
| commit | b342ea603f0c767759639a002b9db638231e989c (patch) | |
| tree | 7bcaa714f6ad6246749cb53a9f882b3da0119fdf /libavcodec/mjpegenc.h | |
| parent | d8fb209a7fbe0256a86df578b0c8d284e2a0d3e2 (diff) | |
| parent | 3360ad995530ea6967b1e83981b4aa8240fbb0ed (diff) | |
Merge commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed'
* commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed':
mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_trailer()
Conflicts:
libavcodec/ljpegenc.c
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegenc.h b/libavcodec/mjpegenc.h index 7a3a62562f..293fe0f948 100644 --- a/libavcodec/mjpegenc.h +++ b/libavcodec/mjpegenc.h @@ -54,7 +54,7 @@ void ff_mjpeg_encode_close(MpegEncContext *s); void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb, ScanTable *intra_scantable, uint16_t intra_matrix[64]); -void ff_mjpeg_encode_picture_trailer(MpegEncContext *s); +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, uint8_t *huff_size, uint16_t *huff_code); |