[FFmpeg-cvslog] ffmpeg: improve reporting if size/pixel format changes

Stefano Sabatini git at videolan.org
Thu May 12 04:55:08 CEST 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Sat Apr 16 22:58:13 2011 +0200| [2ecc5b70fb53d0e2e74b51d1d598af8c842afc68] | committer: Anton Khirnov

ffmpeg: improve reporting if size/pixel format changes

Use av_log() rather than fprintf(stderr, ...), and show information
related to the previous size/pixel format configuration.

Consistent with the corresponding message issued in case of audio
configuration change.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Signed-off-by: Anton Khirnov <anton at khirnov.net>

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

 ffmpeg.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 612a413..8975586 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1129,8 +1129,11 @@ static void do_video_out(AVFormatContext *s,
     if (   ost->resample_height != ist->st->codec->height
         || ost->resample_width  != ist->st->codec->width
         || (ost->resample_pix_fmt!= ist->st->codec->pix_fmt) ) {
-
-        fprintf(stderr,"Input Stream #%d.%d frame size changed to %dx%d, %s\n", ist->file_index, ist->index, ist->st->codec->width,     ist->st->codec->height,avcodec_get_pix_fmt_name(ist->st->codec->pix_fmt));
+        av_log(NULL, AV_LOG_INFO,
+               "Input stream #%d.%d frame changed from size:%dx%d fmt:%s to size:%dx%d fmt:%s\n",
+               ist->file_index, ist->index,
+               ost->resample_width  , ost->resample_height  , avcodec_get_pix_fmt_name(ost->resample_pix_fmt),
+               ist->st->codec->width, ist->st->codec->height, avcodec_get_pix_fmt_name(ist->st->codec->pix_fmt));
         if(!ost->video_resample)
             ffmpeg_exit(1);
     }



More information about the ffmpeg-cvslog mailing list