diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-12-01 22:05:18 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-12-05 13:34:26 +0100 |
| commit | 058d5f2feb730846f22c1812e433f92f670ad751 (patch) | |
| tree | 0728845a22512169b30acba88041d68a6d3ba7fa /libavcodec/mpegvideo_enc.c | |
| parent | 6d70639c7d5fe762c5f18de574eafa817fb53ef7 (diff) | |
| download | ffmpeg-058d5f2feb730846f22c1812e433f92f670ad751.tar.gz | |
mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_header()
This will allow deMpegEncContextizing the LJPEG encoder.
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 981bf6bb36..f00eb29721 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3296,7 +3296,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) |