summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-04 14:40:40 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-04 14:40:40 +0200
commit514d9bb55d4f00a4babc25e3a9817521c0502a47 (patch)
treebcd5d626ac0f247e7a58e8ec2bda2b159aaa75ad /libavcodec/h264.c
parent4b030025278ac4adc3616510f36de4c7a113c5fb (diff)
downloadffmpeg-streaming-514d9bb55d4f00a4babc25e3a9817521c0502a47.zip
ffmpeg-streaming-514d9bb55d4f00a4babc25e3a9817521c0502a47.tar.gz
avcodec/h264: use goto end instead of return for hwaccel fails as well
This is more correct Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 62cb241..33a66be 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1598,7 +1598,7 @@ again:
if (h->avctx->hwaccel &&
(ret = h->avctx->hwaccel->start_frame(h->avctx, buf, buf_size)) < 0)
- return ret;
+ goto end;
if (CONFIG_H264_VDPAU_DECODER &&
h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
ff_vdpau_h264_picture_start(h);
@@ -1610,7 +1610,7 @@ again:
&buf[buf_index - consumed],
consumed);
if (ret < 0)
- return ret;
+ goto end;
} else if (CONFIG_H264_VDPAU_DECODER &&
h->avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) {
ff_vdpau_add_data_chunk(h->cur_pic_ptr->f.data[0],
OpenPOWER on IntegriCloud