Commit 52dc82d6 authored by michael's avatar michael

Approved hunk from the AVHWaccel patch by Gwenole Beauchesne.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17563 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent e79d4241
...@@ -134,7 +134,7 @@ av_cold int ff_h263_decode_end(AVCodecContext *avctx) ...@@ -134,7 +134,7 @@ av_cold int ff_h263_decode_end(AVCodecContext *avctx)
static int get_consumed_bytes(MpegEncContext *s, int buf_size){ static int get_consumed_bytes(MpegEncContext *s, int buf_size){
int pos= (get_bits_count(&s->gb)+7)>>3; 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 ... //we would have to scan through the whole buf to handle the weird reordering ...
return buf_size; return buf_size;
}else if(s->flags&CODEC_FLAG_TRUNCATED){ }else if(s->flags&CODEC_FLAG_TRUNCATED){
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment