[SCM] libav/experimental: Approved hunk from the AVHWaccel patch by Gwenole Beauchesne.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:39:24 UTC 2013


The following commit has been merged in the experimental branch:
commit c0aec489a67d0d228ddc0a2931774a68f857eaaf
Author: Gwenole Beauchesne <gbeauchesne at splitted-desktop.com>
Date:   Tue Feb 24 18:24:56 2009 +0000

    Approved hunk from the AVHWaccel patch by Gwenole Beauchesne.
    
    Originally committed as revision 17563 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index d2c8fd1..93ad095 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -134,7 +134,7 @@ av_cold int ff_h263_decode_end(AVCodecContext *avctx)
 static int get_consumed_bytes(MpegEncContext *s, int buf_size){
     int pos= (get_bits_count(&s->gb)+7)>>3;
 
-    if(s->divx_packed){
+    if(s->divx_packed || s->avctx->hwaccel){
         //we would have to scan through the whole buf to handle the weird reordering ...
         return buf_size;
     }else if(s->flags&CODEC_FLAG_TRUNCATED){

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list