changeset 10675:03d02e21b432 libavcodec

Fail earlier for unsupported resolutions or pixel formats when encoding dv. Patch by Tomas H¸«£rdin, tomas D hardin A codemill D se
author cehoyos
date Fri, 11 Dec 2009 23:56:49 +0000
parents f04468776158
children 8ee37f5571dc
files dv.c
diffstat 1 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/dv.c	Fri Dec 11 21:50:08 2009 +0000
+++ b/dv.c	Fri Dec 11 23:56:49 2009 +0000
@@ -398,6 +398,17 @@
     return 0;
 }
 
+static av_cold int dvvideo_init_encoder(AVCodecContext *avctx)
+{
+    if (!ff_dv_codec_profile(avctx)) {
+        av_log(avctx, AV_LOG_ERROR, "Found no DV profile for %ix%i %s video\n",
+               avctx->width, avctx->height, avcodec_get_pix_fmt_name(avctx->pix_fmt));
+        return -1;
+    }
+
+    return dvvideo_init(avctx);
+}
+
 // #define VLC_DEBUG
 // #define printf(...) av_log(NULL, AV_LOG_ERROR, __VA_ARGS__)
 
@@ -1326,7 +1337,7 @@
     CODEC_TYPE_VIDEO,
     CODEC_ID_DVVIDEO,
     sizeof(DVVideoContext),
-    dvvideo_init,
+    dvvideo_init_encoder,
     dvvideo_encode_frame,
     .pix_fmts  = (const enum PixelFormat[]) {PIX_FMT_YUV411P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, PIX_FMT_NONE},
     .long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),