[FFmpeg-cvslog] smacker: read escape codes in single get_bits() call

Paul B Mahol git at videolan.org
Mon Oct 1 09:55:26 CEST 2012


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sun Sep 30 14:49:08 2012 +0000| [adc5539e7b94a94114d591d83e7ae63f52b5916f] | committer: Paul B Mahol

smacker: read escape codes in single get_bits() call

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

 libavcodec/smacker.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
index 4913625..e02c76c 100644
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -231,12 +231,9 @@ static int smacker_decode_header_tree(SmackVContext *smk, GetBitContext *gb, int
         av_log(smk->avctx, AV_LOG_ERROR, "Skipping high bytes tree\n");
     }
 
-    escapes[0]  = get_bits(gb, 8);
-    escapes[0] |= get_bits(gb, 8) << 8;
-    escapes[1]  = get_bits(gb, 8);
-    escapes[1] |= get_bits(gb, 8) << 8;
-    escapes[2]  = get_bits(gb, 8);
-    escapes[2] |= get_bits(gb, 8) << 8;
+    escapes[0]  = get_bits(gb, 16);
+    escapes[1]  = get_bits(gb, 16);
+    escapes[2]  = get_bits(gb, 16);
 
     last[0] = last[1] = last[2] = -1;
 



More information about the ffmpeg-cvslog mailing list