Skip to content
Snippets Groups Projects
Commit c0aec489 authored by Gwenole Beauchesne's avatar Gwenole Beauchesne Committed by Michael Niedermayer
Browse files

Approved hunk from the AVHWaccel patch by Gwenole Beauchesne.

Originally committed as revision 17563 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 66d4c628
No related branches found
No related tags found
No related merge requests found
...@@ -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){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment