[FFmpeg-cvslog] avcodec/h264: use goto end instead of return for hwaccel fails as well
Michael Niedermayer
git at videolan.org
Sat Apr 4 18:27:06 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 4 14:40:40 2015 +0200| [514d9bb55d4f00a4babc25e3a9817521c0502a47] | committer: Michael Niedermayer
avcodec/h264: use goto end instead of return for hwaccel fails as well
This is more correct
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=514d9bb55d4f00a4babc25e3a9817521c0502a47
---
libavcodec/h264.c | 4 ++--
1 file 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],
More information about the ffmpeg-cvslog
mailing list