generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h264: avoid calling get_format() multiple times

Browse Source 
Some applications do not like that.
Fixes VDA
Reduces noise for VDPAU

Tested-by: Guillaume POIRIER <poirierg@gmail.com>
Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit dece584a63)

Conflicts:

	libavcodec/h264.c
This commit is contained in:
Michael Niedermayer
2013-02-17 20:41:16 +01:00
parent 6407800521
commit c6f59b95c5
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/h264.c
View File

@@ -2537,11 +2537,17 @@ static enum PixelFormat get_pixel_format(H264Context *h)
return s->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ422P return s->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ422P
: AV_PIX_FMT_YUV422P; : AV_PIX_FMT_YUV422P;
} else { } else {
return s->avctx->get_format(s->avctx, s->avctx->codec->pix_fmts ? int i;
const enum AVPixelFormat * fmt = s->avctx->codec->pix_fmts ?
s->avctx->codec->pix_fmts : s->avctx->codec->pix_fmts :
s->avctx->color_range == AVCOL_RANGE_JPEG ? s->avctx->color_range == AVCOL_RANGE_JPEG ?
hwaccel_pixfmt_list_h264_jpeg_420 : hwaccel_pixfmt_list_h264_jpeg_420 :
ff_hwaccel_pixfmt_list_420); ff_hwaccel_pixfmt_list_420;
for (i=0; fmt[i] != AV_PIX_FMT_NONE; i++)
if (fmt[i] == s->avctx->pix_fmt)
return fmt[i];
return s->avctx->get_format(s->avctx, fmt);
} }
break; break;
default: default: