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/h264.h | |
parent | 36be045ed7942e07742c3cf3d3012b1d2a9ec344 (diff) | |
parent | a99273ebf328658c183c2d267f1c2b8bfac58bb3 (diff) | |
download | ffmpeg-streaming-3ba0bfe71fb18e955ca0110e5a65105d84932fbc.zip ffmpeg-streaming-3ba0bfe71fb18e955ca0110e5a65105d84932fbc.tar.gz |
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/h264.h')
-rw-r--r-- | libavcodec/h264.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 196aba9..495439f 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -690,13 +690,13 @@ av_cold void ff_h264_decode_init_vlc(void); /** * Decode a macroblock - * @return 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed + * @return 0 if OK, ER_AC_ERROR / ER_DC_ERROR / ER_MV_ERROR if an error is noticed */ int ff_h264_decode_mb_cavlc(H264Context *h); /** * Decode a CABAC coded macroblock - * @return 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed + * @return 0 if OK, ER_AC_ERROR / ER_DC_ERROR / ER_MV_ERROR if an error is noticed */ int ff_h264_decode_mb_cabac(H264Context *h); |