diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 11:49:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 11:49:53 +0100 |
| commit | 9fcd58ab261b166271d286841c0f142e67856011 (patch) | |
| tree | 8f9b3c6a2f5f03e94174113c625ad279665becb8 /libavcodec | |
| parent | f2d8e3c031247a651f6f0a527bcf669b4553d414 (diff) | |
| download | ffmpeg-9fcd58ab261b166271d286841c0f142e67856011.tar.gz | |
avcodec/mjpegenc: make escape_FF() non static
This will be used by ljpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mjpegenc.c | 4 | ||||
| -rw-r--r-- | libavcodec/mjpegenc.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index d17055178f..34de4bdbd0 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -324,7 +324,7 @@ end: s->thread_context[i]->esc_pos = 0; } -static void escape_FF(PutBitContext *pb, int start) +void ff_mjpeg_escape_FF(PutBitContext *pb, int start) { int size = put_bits_count(pb) - start * 8; int i, ff_count; @@ -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->pb, s->esc_pos); + ff_mjpeg_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)); diff --git a/libavcodec/mjpegenc.h b/libavcodec/mjpegenc.h index db79b44c10..21efd486a5 100644 --- a/libavcodec/mjpegenc.h +++ b/libavcodec/mjpegenc.h @@ -55,6 +55,7 @@ void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb, ScanTable *intra_scantable, uint16_t intra_matrix[64]); void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits); +void ff_mjpeg_escape_FF(PutBitContext *pb, int start); void ff_mjpeg_encode_stuffing(MpegEncContext *s); void ff_mjpeg_encode_dc(PutBitContext *pb, int val, uint8_t *huff_size, uint16_t *huff_code); |