diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 15:37:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 15:38:09 +0200 |
| commit | b3dfda8a410dba1ff2a80b4e243befce1d5f79c5 (patch) | |
| tree | a8b57b7522e4e897f9eb95f48450abd2a5c3ec51 /libavcodec | |
| parent | 2c8d876dea153b387c57d9ec5809780c21414b84 (diff) | |
| parent | 711c970168297683860422e95d6b7e37ee3c8367 (diff) | |
Merge commit '711c970168297683860422e95d6b7e37ee3c8367'
* commit '711c970168297683860422e95d6b7e37ee3c8367':
rv34: Check the return value from ff_rv34_decode_init
Conflicts:
libavcodec/rv30.c
libavcodec/rv40.c
See: b86651a208ee67666a7305b002bc9f14b21dae7f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/rv30.c | 3 | ||||
| -rw-r--r-- | libavcodec/rv40.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index 48d769142c..3292ad010b 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -251,8 +251,7 @@ static av_cold int rv30_decode_init(AVCodecContext *avctx) int ret; r->rv30 = 1; - ret = ff_rv34_decode_init(avctx); - if (ret < 0) + if ((ret = ff_rv34_decode_init(avctx)) < 0) return ret; if(avctx->extradata_size < 2){ av_log(avctx, AV_LOG_ERROR, "Extradata is too small.\n"); diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index 57e32f35a9..e88f61942a 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -550,8 +550,7 @@ static av_cold int rv40_decode_init(AVCodecContext *avctx) int ret; r->rv30 = 0; - ret = ff_rv34_decode_init(avctx); - if (ret < 0) + if ((ret = ff_rv34_decode_init(avctx)) < 0) return ret; if(!aic_top_vlc.bits) rv40_init_tables(); |