diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 11:04:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 11:16:05 +0100 |
| commit | d8fb209a7fbe0256a86df578b0c8d284e2a0d3e2 (patch) | |
| tree | d8cab68bc9c4848bf82a768ba80ca8c97ff5dc83 /libavcodec/mjpegenc.h | |
| parent | 8f1edc73a885055b7d03292b6457d858bbf377ba (diff) | |
| parent | 058d5f2feb730846f22c1812e433f92f670ad751 (diff) | |
Merge commit '058d5f2feb730846f22c1812e433f92f670ad751'
* commit '058d5f2feb730846f22c1812e433f92f670ad751':
mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_header()
Conflicts:
libavcodec/mjpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegenc.h')
| -rw-r--r-- | libavcodec/mjpegenc.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/mjpegenc.h b/libavcodec/mjpegenc.h index ce0c1cce15..7a3a62562f 100644 --- a/libavcodec/mjpegenc.h +++ b/libavcodec/mjpegenc.h @@ -51,7 +51,9 @@ typedef struct MJpegContext { int ff_mjpeg_encode_init(MpegEncContext *s); void ff_mjpeg_encode_close(MpegEncContext *s); -void ff_mjpeg_encode_picture_header(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_stuffing(MpegEncContext *s); void ff_mjpeg_encode_dc(MpegEncContext *s, int val, |