summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzuxy <zuxy@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-07 04:59:50 +0000
committerzuxy <zuxy@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-01-07 04:59:50 +0000
commit554231067da1c2aaa65639b62fed3ee0b89667c6 (patch)
treebe70489b51fbe343f979255ecd9ad84021ef3280
parent78267a4d210cd374c49aa6a56f8e3a16e0aad4b5 (diff)
downloadmpv-554231067da1c2aaa65639b62fed3ee0b89667c6.tar.bz2
mpv-554231067da1c2aaa65639b62fed3ee0b89667c6.tar.xz
Avoid the error message "Unsupported PixelFormat -1" for ffh264 decoding
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30233 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpcodecs/vd_ffmpeg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index ded6feb4f8..1a6290c988 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -207,6 +207,8 @@ void mp_msp_av_log_callback(void *ptr, int level, const char *fmt, va_list vl)
static void set_format_params(struct AVCodecContext *avctx, enum PixelFormat fmt){
int imgfmt;
+ if (fmt == PIX_FMT_NONE)
+ return;
imgfmt = pixfmt2imgfmt(fmt);
if (IMGFMT_IS_XVMC(imgfmt) || IMGFMT_IS_VDPAU(imgfmt)) {
sh_video_t *sh = avctx->opaque;