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/mpegvideo_enc.c | |
| 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/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 7c46f74f3b..dcbdc036da 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1598,7 +1598,7 @@ vbv_retry: frame_end(s); if (CONFIG_MJPEG_ENCODER && s->out_format == FMT_MJPEG) - ff_mjpeg_encode_picture_trailer(s); + ff_mjpeg_encode_picture_trailer(&s->pb, s->header_bits); if (avctx->rc_buffer_size) { RateControlContext *rcc = &s->rc_context; |