virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '46430fd47c6239ef8742d0a34f9412d5060fa798'

Browse Source 
* commit '46430fd47c6239ef8742d0a34f9412d5060fa798':
  vc1dec: Don't attempt error concealment on field pictures
  vc1dec: fieldtx is only valid for interlaced frame pictures
  aacenc: Fix erasure of surround channels
  aacenc: Fix target bitrate for twoloop quantiser search

Conflicts:
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-05-15 09:49:17 +02:00
parent 772c801c7d 46430fd47c
commit b602e47f12
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/vc1dec.c
View File

@@ -6140,7 +6140,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
// return -1; // return -1;
if(s->er.error_occurred && s->pict_type == AV_PICTURE_TYPE_B) if(s->er.error_occurred && s->pict_type == AV_PICTURE_TYPE_B)
goto err; goto err;
if(!v->field_mode) if (!v->field_mode)
ff_er_frame_end(&s->er); ff_er_frame_end(&s->er);
} }