[FFmpeg-cvslog] h264: avoid calling get_format() multiple times
Michael Niedermayer
git at videolan.org
Tue Feb 19 01:14:15 CET 2013
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 17 20:41:16 2013 +0100| [c6f59b95c529baf2ea6729ab9089fddce3ddd86a] | committer: Michael Niedermayer
h264: avoid calling get_format() multiple times
Some applications do not like that.
Fixes VDA
Reduces noise for VDPAU
Tested-by: Guillaume POIRIER <poirierg at gmail.com>
Tested-by: Carl Eugen Hoyos <cehoyos at ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit dece584a639c9fd61a72e21800815e8397b3b617)
Conflicts:
libavcodec/h264.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c6f59b95c529baf2ea6729ab9089fddce3ddd86a
---
libavcodec/h264.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 56ef109..da749a2 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2537,11 +2537,17 @@ static enum PixelFormat get_pixel_format(H264Context *h)
return s->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ422P
: AV_PIX_FMT_YUV422P;
} 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->color_range == AVCOL_RANGE_JPEG ?
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;
default:
More information about the ffmpeg-cvslog
mailing list