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/mjpegenc.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/mjpegenc.c')
| -rw-r--r-- | libavcodec/mjpegenc.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 4bc807641e..f3c05c955f 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -324,11 +324,11 @@ end: s->thread_context[i]->esc_pos = 0; } -static void escape_FF(MpegEncContext *s, int start) +static void escape_FF(PutBitContext *pb, int start) { - int size= put_bits_count(&s->pb) - start*8; + int size = put_bits_count(pb) - start * 8; int i, ff_count; - uint8_t *buf= s->pb.buf + start; + uint8_t *buf = pb->buf + start; int align= (-(size_t)(buf))&3; av_assert1((size&7) == 0); @@ -361,8 +361,8 @@ static void escape_FF(MpegEncContext *s, int start) if(ff_count==0) return; - flush_put_bits(&s->pb); - skip_put_bytes(&s->pb, ff_count); + flush_put_bits(pb); + skip_put_bytes(pb, ff_count); for(i=size-1; ff_count; i--){ int v= buf[i]; @@ -385,7 +385,7 @@ void ff_mjpeg_encode_stuffing(MpegEncContext *s) if(length) put_bits(pbc, length, (1<<length)-1); flush_put_bits(&s->pb); - escape_FF(s, s->esc_pos); + escape_FF(&s->pb, s->esc_pos); if((s->avctx->active_thread_type & FF_THREAD_SLICE) && mb_y < s->mb_height) put_marker(pbc, RST0 + (mb_y&7)); @@ -395,13 +395,11 @@ void ff_mjpeg_encode_stuffing(MpegEncContext *s) s->last_dc[i] = 128 << s->intra_dc_precision; } -void ff_mjpeg_encode_picture_trailer(MpegEncContext *s) +void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits) { + av_assert1((header_bits & 7) == 0); - av_assert1((s->header_bits&7)==0); - - - put_marker(&s->pb, EOI); + put_marker(pb, EOI); } void ff_mjpeg_encode_dc(MpegEncContext *s, int val, |