diff options
| author | wm4 <wm4@nowhere> | 2013-12-21 18:04:16 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-21 20:50:11 +0100 |
| commit | 64278128d8d5315a19da6d319517c48fa97da3f4 (patch) | |
| tree | 9e85fdaf3397101a81c3bd7acc835dc4b787fff6 /video/out/vo_lavc.c | |
| parent | 5beedf1967f93ad4edfb6d1dd2edf9f4660a5afe (diff) | |
| download | mpv-64278128d8d5315a19da6d319517c48fa97da3f4.tar.bz2 mpv-64278128d8d5315a19da6d319517c48fa97da3f4.tar.xz | |
video/fmt-conversion.c: remove unknown pixel format messages
This removes the messages printed on unknown pixel format messages.
Passing a mp_log to them would be too messy. Actually, this is a good
change, because in the past we often had trouble with these messages
printed too often (causing terminal spam etc.), and printing warnings or
error messages on the caller sides is much cleaner.
vd_lavc.c had a change earlier to print an error message if a decoder
outputs an unsupported pixel format.
Diffstat (limited to 'video/out/vo_lavc.c')
| -rw-r--r-- | video/out/vo_lavc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c index 56933e2309..c0b317da94 100644 --- a/video/out/vo_lavc.c +++ b/video/out/vo_lavc.c @@ -135,8 +135,11 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, vc->lastframeipts = MP_NOPTS_VALUE; vc->lastencodedipts = MP_NOPTS_VALUE; - if (pix_fmt == AV_PIX_FMT_NONE) - goto error; /* imgfmt2pixfmt already prints something */ + if (pix_fmt == AV_PIX_FMT_NONE) { + MP_FATAL(vo, "Format %s not supported by lavc.\n", + mp_imgfmt_to_name(format)); + goto error; + } vc->stream = encode_lavc_alloc_stream(vo->encode_lavc_ctx, AVMEDIA_TYPE_VIDEO); |