diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 11:49:17 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 11:49:17 +0400 |
| commit | b602e47f12d72b383d986d66212341af31c9bc82 (patch) | |
| tree | d897ea1a130c3cd040f6f2a495b757c8d1b7337a /libavcodec/vc1dec.c | |
| parent | 772c801c7db9ef2979356059099661d5159daeea (diff) | |
| parent | 46430fd47c6239ef8742d0a34f9412d5060fa798 (diff) | |
Merge commit '46430fd47c6239ef8742d0a34f9412d5060fa798'
* 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>
Diffstat (limited to 'libavcodec/vc1dec.c')
| -rw-r--r-- | libavcodec/vc1dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index bce0b452e1..6bf38e6cb7 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -6140,7 +6140,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, // return -1; if(s->er.error_occurred && s->pict_type == AV_PICTURE_TYPE_B) goto err; - if(!v->field_mode) + if (!v->field_mode) ff_er_frame_end(&s->er); } |