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/ljpegenc.c | |
| parent | d8fb209a7fbe0256a86df578b0c8d284e2a0d3e2 (diff) | |
| parent | 3360ad995530ea6967b1e83981b4aa8240fbb0ed (diff) | |
| download | ffmpeg-b342ea603f0c767759639a002b9db638231e989c.tar.gz | |
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/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 09ae7905b2..c467d636fd 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -210,8 +210,9 @@ static int encode_picture_lossless(AVCodecContext *avctx, AVPacket *pkt, emms_c(); av_assert0(s->esc_pos == s->header_bits >> 3); + ff_mjpeg_encode_stuffing(s); - ff_mjpeg_encode_picture_trailer(s); + ff_mjpeg_encode_picture_trailer(&s->pb, s->header_bits); s->picture_number++; flush_put_bits(&s->pb); |