[FFmpeg-cvslog] lavc/vdpau_vp9: Do not mix declarations and code.
Carl Eugen Hoyos
git at videolan.org
Mon Jan 6 23:59:06 EET 2020
ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg at gmail.com> | Mon Jan 6 22:57:54 2020 +0100| [a665a2ecda021012e5ec277ff16ca0014aa36b1d] | committer: Carl Eugen Hoyos
lavc/vdpau_vp9: Do not mix declarations and code.
Fixes the following gcc warning:
libavcodec/vdpau_vp9.c:45:5: warning: ISO C90 forbids mixed declarations and code
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a665a2ecda021012e5ec277ff16ca0014aa36b1d
---
libavcodec/vdpau_vp9.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/libavcodec/vdpau_vp9.c b/libavcodec/vdpau_vp9.c
index f1ee4ac5e0..54e060fad5 100644
--- a/libavcodec/vdpau_vp9.c
+++ b/libavcodec/vdpau_vp9.c
@@ -35,16 +35,15 @@ static int vdpau_vp9_start_frame(AVCodecContext *avctx,
{
VP9Context *s = avctx->priv_data;
VP9SharedContext *h = &(s->s);
- const AVPixFmtDescriptor *pixdesc = av_pix_fmt_desc_get(avctx->sw_pix_fmt);
- if (!pixdesc) {
- return AV_PIX_FMT_NONE;
- }
-
VP9Frame pic = h->frames[CUR_FRAME];
struct vdpau_picture_context *pic_ctx = pic.hwaccel_picture_private;
int i;
VdpPictureInfoVP9 *info = &pic_ctx->info.vp9;
+ const AVPixFmtDescriptor *pixdesc = av_pix_fmt_desc_get(avctx->sw_pix_fmt);
+ if (!pixdesc) {
+ return AV_PIX_FMT_NONE;
+ }
info->width = avctx->width;
info->height = avctx->height;
More information about the ffmpeg-cvslog
mailing list