diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 15:51:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 15:52:44 +0100 |
| commit | a4f8a5649561906ccad7f15247f033e7b8df4a4e (patch) | |
| tree | 58dc2a31b81513c6c9d2320c95a6b7d5472035a8 | |
| parent | 3328d105f76c21e5ca87471b8a8b51af9801dc17 (diff) | |
| parent | 4736d003fac30af4afd8390182f12f480ad78801 (diff) | |
| download | ffmpeg-a4f8a5649561906ccad7f15247f033e7b8df4a4e.tar.gz | |
Merge commit '4736d003fac30af4afd8390182f12f480ad78801'
* commit '4736d003fac30af4afd8390182f12f480ad78801':
cavsdec: check ff_get_buffer() return value
Conflicts:
libavcodec/cavsdec.c
See: eee8c94f50bfcd93c1f761b4e6b55bec3815616d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/cavsdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index 44d0ec0f9c..93d1c59d5a 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -948,8 +948,8 @@ static inline int check_for_slice(AVSContext *h) static int decode_pic(AVSContext *h) { - int skip_count = -1; int ret; + int skip_count = -1; enum cavs_mb mb_type; if (!h->top_qp) { @@ -985,9 +985,9 @@ static int decode_pic(AVSContext *h) skip_bits(&h->gb, 1); //marker_bit } - if ((ret = ff_get_buffer(h->avctx, h->cur.f, - h->cur.f->pict_type == AV_PICTURE_TYPE_B ? - 0 : AV_GET_BUFFER_FLAG_REF)) < 0) + ret = ff_get_buffer(h->avctx, h->cur.f, h->cur.f->pict_type == AV_PICTURE_TYPE_B ? + 0 : AV_GET_BUFFER_FLAG_REF); + if (ret < 0) return ret; if (!h->edge_emu_buffer) { |