summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorGwenole Beauchesne <gbeauchesne@splitted-desktop.com>2009-02-24 18:24:56 +0000
committerMichael Niedermayer <michaelni@gmx.at>2009-02-24 18:24:56 +0000
commitc0aec489a67d0d228ddc0a2931774a68f857eaaf (patch)
treeabf131457899b32a384a7debe8e9e349ba10f426 /libavcodec
parent66d4c62806a97b2eb14164c97fe9060c241e7f8e (diff)
Approved hunk from the AVHWaccel patch by Gwenole Beauchesne.
Originally committed as revision 17563 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h263dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index d2c8fd17f7..93ad095a4f 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){