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/ljpegenc.c | |
| 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/ljpegenc.c')
| -rw-r--r-- | libavcodec/ljpegenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index 09aeaaa847..09ae7905b2 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -79,7 +79,8 @@ static int encode_picture_lossless(AVCodecContext *avctx, AVPacket *pkt, p->pict_type= AV_PICTURE_TYPE_I; p->key_frame= 1; - ff_mjpeg_encode_picture_header(s); + ff_mjpeg_encode_picture_header(avctx, &s->pb, &s->intra_scantable, + s->intra_matrix); s->header_bits= put_bits_count(&s->pb); |