diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 02:44:37 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 02:44:37 +0200 |
| commit | 819b8f08a2d2223a9a4e9a3c65b05b3a3bfaf781 (patch) | |
| tree | f6d6d1e944e5b44ac1d26adcecc4379cd9dc4806 /libmpcodecs | |
| parent | 3488fcafe6709337b25a742999a03d04d561f419 (diff) | |
| parent | 3f1a03feb15344188a8213854246d42db38314ac (diff) | |
| download | mpv-819b8f08a2d2223a9a4e9a3c65b05b3a3bfaf781.tar.bz2 mpv-819b8f08a2d2223a9a4e9a3c65b05b3a3bfaf781.tar.xz | |
Merge svn changes up to r30236
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 9b833dac72..83dea0b2e5 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -146,6 +146,8 @@ static int control(sh_video_t *sh, int cmd, void *arg, ...){ 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; |