diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-25 00:38:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-25 00:38:16 +0200 |
| commit | 65e63072f81641f50e5775be5c3b2873e8d6f38e (patch) | |
| tree | 766617aff5fadbb6bee949ee7669c9431d00a374 /libavcodec | |
| parent | ba4aa656ce1c4e530bec4ed1b0fcf67eb20283f0 (diff) | |
| parent | a4d3f3580bd993f4e8f4abc9c4ad486cb1c51987 (diff) | |
| download | ffmpeg-65e63072f81641f50e5775be5c3b2873e8d6f38e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: Return a proper error code instead of -1
rtmp: Check malloc calls
rtmp: Check ff_rtmp_packet_create calls
lavfi: add audio mix filter
flvdec: Make sure sample_rate is set to the updated value
tqi: Pass errors from the MB decoder
Conflicts:
Changelog
doc/filters.texi
libavcodec/eatqi.c
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/eatqi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c index 9e773bcb0e..55c080dea8 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -62,7 +62,7 @@ static int tqi_decode_mb(MpegEncContext *s, DCTELEM (*block)[64]) int n; s->dsp.clear_blocks(block[0]); for (n=0; n<6; n++) - if(ff_mpeg1_decode_block_intra(s, block[n], n)<0) + if (ff_mpeg1_decode_block_intra(s, block[n], n) < 0) return -1; return 0; @@ -138,7 +138,7 @@ static int tqi_decode_frame(AVCodecContext *avctx, for (s->mb_y=0; s->mb_y<(avctx->height+15)/16; s->mb_y++) for (s->mb_x=0; s->mb_x<(avctx->width+15)/16; s->mb_x++) { - if(tqi_decode_mb(s, t->block) < 0) + if (tqi_decode_mb(s, t->block) < 0) goto end; tqi_idct_put(t, t->block); } |