[FFmpeg-cvslog] ffprobe: use new avformat_open_* API.

Anton Khirnov git at videolan.org
Sat Jun 18 05:18:41 CEST 2011


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Thu Jun  9 10:58:23 2011 +0200| [e0518705c8f575488a50407eee3edcc94c905973] | committer: Anton Khirnov

ffprobe: use new avformat_open_* API.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e0518705c8f575488a50407eee3edcc94c905973
---

 ffprobe.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ffprobe.c b/ffprobe.c
index e00790f..711a172 100644
--- a/ffprobe.c
+++ b/ffprobe.c
@@ -262,15 +262,18 @@ static void show_format(AVFormatContext *fmt_ctx)
 static int open_input_file(AVFormatContext **fmt_ctx_ptr, const char *filename)
 {
     int err, i;
-    AVFormatContext *fmt_ctx;
-
-    fmt_ctx = avformat_alloc_context();
-    set_context_opts(fmt_ctx, avformat_opts, AV_OPT_FLAG_DECODING_PARAM, NULL);
+    AVFormatContext *fmt_ctx = NULL;
+    AVDictionaryEntry *t;
 
-    if ((err = av_open_input_file(&fmt_ctx, filename, iformat, 0, NULL)) < 0) {
+    if ((err = avformat_open_input(&fmt_ctx, filename, iformat, &format_opts)) < 0) {
         print_error(filename, err);
         return err;
     }
+    if ((t = av_dict_get(format_opts, "", NULL, AV_DICT_IGNORE_SUFFIX))) {
+        av_log(NULL, AV_LOG_ERROR, "Option %s not found.\n", t->key);
+        return AVERROR_OPTION_NOT_FOUND;
+    }
+
 
     /* fill the streams in the format context */
     if ((err = av_find_stream_info(fmt_ctx)) < 0) {



More information about the ffmpeg-cvslog mailing list