diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 14:55:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-19 15:44:59 +0100 |
| commit | 642a655f7d9a6afc97fff5f3ecd6a7ad5d53e0ca (patch) | |
| tree | b09ea65812ccdada345d88802afa71016e1b357e /libavcodec/cavsdec.c | |
| parent | e84194f06024892fc33684c5a1726c97a0c0a45c (diff) | |
| parent | f1d8763a02b5fce9a7d9789e049d74a45b15e1e8 (diff) | |
Merge commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8'
* commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8':
mpegvideo: allocate scratch buffers after linesize is known
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cavsdec.c')
| -rw-r--r-- | libavcodec/cavsdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index cf86ab4c96..cdcdccbd9c 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -966,7 +966,8 @@ static int decode_pic(AVSContext *h) { if ((ret = ff_get_buffer(s->avctx, &h->picture.f)) < 0) return ret; - ff_cavs_init_pic(h); + if ((ret = ff_cavs_init_pic(h)) < 0) + return ret; h->picture.poc = get_bits(&s->gb,8)*2; /* get temporal distances and MV scaling factors */ |