[FFmpeg-cvslog] avcodec/mjpegenc: make escape_FF() non static

Michael Niedermayer git at videolan.org
Fri Dec 6 12:11:48 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 11:49:53 2013 +0100| [9fcd58ab261b166271d286841c0f142e67856011] | committer: Michael Niedermayer

avcodec/mjpegenc: make escape_FF() non static

This will be used by ljpeg

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9fcd58ab261b166271d286841c0f142e67856011
---

 libavcodec/mjpegenc.c |    4 ++--
 libavcodec/mjpegenc.h |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index d170551..34de4bd 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 db79b44..21efd48 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);



More information about the ffmpeg-cvslog mailing list