diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 14:04:27 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 14:16:05 +0400 |
commit | d8fb209a7fbe0256a86df578b0c8d284e2a0d3e2 (patch) | |
tree | d8cab68bc9c4848bf82a768ba80ca8c97ff5dc83 /libavcodec/mpegvideo_enc.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/mpegvideo_enc.c')
-rw-r--r-- | libavcodec/mpegvideo_enc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 9e0193a02a..7c46f74f3b 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3488,7 +3488,8 @@ static int encode_picture(MpegEncContext *s, int picture_number) switch(s->out_format) { case FMT_MJPEG: if (CONFIG_MJPEG_ENCODER) - ff_mjpeg_encode_picture_header(s); + ff_mjpeg_encode_picture_header(s->avctx, &s->pb, &s->intra_scantable, + s->intra_matrix); break; case FMT_H261: if (CONFIG_H261_ENCODER) |