diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-13 23:21:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-13 23:21:37 +0100 |
| commit | 3ba0bfe71fb18e955ca0110e5a65105d84932fbc (patch) | |
| tree | b308d41d170483c23c31c87d8dcb19fc169e2eb6 /libavcodec/intrax8.c | |
| parent | 36be045ed7942e07742c3cf3d3012b1d2a9ec344 (diff) | |
| parent | a99273ebf328658c183c2d267f1c2b8bfac58bb3 (diff) | |
| download | android_external_ffmpeg-3ba0bfe71fb18e955ca0110e5a65105d84932fbc.tar.gz android_external_ffmpeg-3ba0bfe71fb18e955ca0110e5a65105d84932fbc.tar.bz2 android_external_ffmpeg-3ba0bfe71fb18e955ca0110e5a65105d84932fbc.zip | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ulti: Fix invalid reads
lavf: dealloc private options in av_write_trailer
yadif: support 10bit YUV
vc1: mark with ER_MB_ERROR bits overconsumption
lavc: introduce ER_MB_END and ER_MB_ERROR
error_resilience: use the ER_ namespace
build: move inclusion of subdir.mak to main subdir loop
rv34: NEON optimised 4x4 dequant
rv34: move 4x4 dequant to RV34DSPContext
aacdec: Use intfloat.h rather than local punning union.
Conflicts:
libavcodec/h264.c
libavcodec/vc1dec.c
libavfilter/vf_yadif.c
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/intrax8.c')
| -rw-r--r-- | libavcodec/intrax8.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 4b0886280b..b50fbfcd1a 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -784,6 +784,6 @@ int ff_intrax8_decode_picture(IntraX8Context * const w, int dquant, int quant_of error: ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, (s->mb_x>>1)-1, (s->mb_y>>1)-1, - (AC_END|DC_END|MV_END) ); + ER_MB_END ); return 0; } |