[FFmpeg-cvslog] r23400 - in branches/0.6: . ffmpeg.c

[siretart]

Author: siretart
Date: Tue Jun  1 08:29:50 2010
New Revision: 23400

Log:
ffmpeg: offer alternatives for experimental codecs if they exist


backport r23398 by janne

Modified:
   branches/0.6/   (props changed)
   branches/0.6/ffmpeg.c

Modified: branches/0.6/ffmpeg.c
==============================================================================
--- branches/0.6/ffmpeg.c	Tue Jun  1 08:28:19 2010	(r23399)
+++ branches/0.6/ffmpeg.c	Tue Jun  1 08:29:50 2010	(r23400)
@@ -2935,6 +2935,12 @@ static enum CodecID find_codec_or_die(co
         fprintf(stderr, "%s '%s' is experimental and might produce bad "
                 "results.\nAdd '-strict experimental' if you want to use it.\n",
                 codec_string, codec->name);
+        codec = encoder ?
+            avcodec_find_encoder(codec->id) :
+            avcodec_find_decoder(codec->id);
+        if (!(codec->capabilities & CODEC_CAP_EXPERIMENTAL))
+            fprintf(stderr, "Or use the non experimental %s '%s'.\n",
+                    codec_string, codec->name);
         av_exit(1);
     }
     return codec->id;