diff options
| author | Jason Garrett-Glaser <darkshikari@gmail.com> | 2009-01-05 08:46:59 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-01-05 08:46:59 +0000 |
| commit | 26ef65daf32c1ffeb7df269aa4bf63fca78ba5c7 (patch) | |
| tree | 3287852aabd0244992359d348c2236c379f54eb4 /libavcodec/h264.c | |
| parent | f2c214a1ec4df7b4bbe45b7f1308b8b31a455310 (diff) | |
50l: Reenable error resilience for H264 (Patch by Dark Shikari).
Originally committed as revision 16434 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 5dad4ce211..eeb5290fed 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -7646,7 +7646,7 @@ static int decode_frame(AVCodecContext *avctx, * past end by one (callers fault) and resync_mb_y != 0 * causes problems for the first MB line, too. */ - if (!avctx->codec_id == CODEC_ID_H264_VDPAU && !FIELD_PICTURE) + if (avctx->codec_id != CODEC_ID_H264_VDPAU && !FIELD_PICTURE) ff_er_frame_end(s); MPV_frame_end(s); |