virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

avcodec/mjpegenc: make escape_FF() non static

Browse Source 
This will be used by ljpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-12-06 11:49:53 +01:00
parent f2d8e3c031
commit 9fcd58ab26
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mjpegenc.c
View File

@@ -324,7 +324,7 @@ end:
s->thread_context[i]->esc_pos = 0; 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 size = put_bits_count(pb) - start * 8;
int i, ff_count; int i, ff_count;
@@ -385,7 +385,7 @@ void ff_mjpeg_encode_stuffing(MpegEncContext *s)
if(length) put_bits(pbc, length, (1<<length)-1); if(length) put_bits(pbc, length, (1<<length)-1);
flush_put_bits(&s->pb); 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) if((s->avctx->active_thread_type & FF_THREAD_SLICE) && mb_y < s->mb_height)
put_marker(pbc, RST0 + (mb_y&7)); put_marker(pbc, RST0 + (mb_y&7));

1
libavcodec/mjpegenc.h
View File

@@ -55,6 +55,7 @@ void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb,
ScanTable *intra_scantable, ScanTable *intra_scantable,
uint16_t intra_matrix[64]); uint16_t intra_matrix[64]);
void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits); 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_stuffing(MpegEncContext *s);
void ff_mjpeg_encode_dc(PutBitContext *pb, int val, void ff_mjpeg_encode_dc(PutBitContext *pb, int val,
uint8_t *huff_size, uint16_t *huff_code); uint8_t *huff_size, uint16_t *huff_code);