[FFmpeg-cvslog] ffv1: add 1 status byte to slices in in case crcs are stored too.

Michael Niedermayer git at videolan.org
Wed Apr 25 12:18:02 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 25 12:05:06 2012 +0200| [c24ca7b88e6388cdd5106bf612b86ba702ac9516] | committer: Michael Niedermayer

ffv1: add 1 status byte to slices in in case crcs are stored too.

This will allow storing of information about corrected and uncorrectable
errors.

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

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

 libavcodec/ffv1.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 5e8fd18..43ab396 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -1298,7 +1298,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
             bytes+=3;
         }
         if(f->ec){
-            unsigned v = av_crc(av_crc_get_table(AV_CRC_32_IEEE), 0, buf_p, bytes);
+            unsigned v;
+            buf_p[bytes++] = 0;
+            v = av_crc(av_crc_get_table(AV_CRC_32_IEEE), 0, buf_p, bytes);
             AV_WL32(buf_p + bytes, v); bytes += 4;
         }
         buf_p += bytes;
@@ -1987,7 +1989,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
     buf_p= buf + buf_size;
     for(i=f->slice_count-1; i>=0; i--){
         FFV1Context *fs= f->slice_context[i];
-        int trailer = 3 + 4*!!f->ec;
+        int trailer = 3 + 5*!!f->ec;
         int v;
 
         if(i || f->ec) v = AV_RB24(buf_p-trailer)+trailer;



More information about the ffmpeg-cvslog mailing list