[FFmpeg-soc] [soc]: r4701 - in concat: ffmpeg.c.diff ffplay.c.diff

[gkovacs]

Author: gkovacs
Date: Mon Jul 13 07:55:43 2009
New Revision: 4701

Log:
switched fprintfs to av_log

Modified:
   concat/ffmpeg.c.diff
   concat/ffplay.c.diff

Modified: concat/ffmpeg.c.diff
==============================================================================
--- concat/ffmpeg.c.diff	Mon Jul 13 07:18:58 2009	(r4700)
+++ concat/ffmpeg.c.diff	Mon Jul 13 07:55:43 2009	(r4701)
@@ -1,5 +1,5 @@
 diff --git a/ffmpeg.c b/ffmpeg.c
-index 22bfed8..235a37b 100644
+index 22bfed8..5f8b256 100644
 --- a/ffmpeg.c
 +++ b/ffmpeg.c
 @@ -70,6 +70,8 @@
@@ -44,13 +44,13 @@ index 22bfed8..235a37b 100644
 +        if (!ist->st->codec->codec) {
 +            AVCodec *codec = avcodec_find_decoder(ist->st->codec->codec_id);
 +            if (!codec) {
-+                fprintf(stderr, "output_packet: Decoder (codec id %d) not found for input stream #%d.%d\n",
-+                        ist->st->codec->codec_id, ist->file_index, ist->index);
++                av_log(ist->st->codec, AV_LOG_ERROR, "Decoder (codec id %d) not found for input stream #%d.%d\n",
++                       ist->st->codec->codec_id, ist->file_index, ist->index);
 +                return AVERROR(EINVAL);
 +             }
 +             if (avcodec_open(ist->st->codec, codec) < 0) {
-+                fprintf(stderr, "output_packet: Error while opening decoder for input stream #%d.%d\n",
-+                        ist->file_index, ist->index);
++                av_log(ist->st->codec, AV_LOG_ERROR, "Error while opening decoder for input stream #%d.%d\n",
++                       ist->file_index, ist->index);
 +                return AVERROR(EINVAL);
 +             }
 +         }

Modified: concat/ffplay.c.diff
==============================================================================
--- concat/ffplay.c.diff	Mon Jul 13 07:18:58 2009	(r4700)
+++ concat/ffplay.c.diff	Mon Jul 13 07:55:43 2009	(r4701)
@@ -1,5 +1,5 @@
 diff --git a/ffplay.c b/ffplay.c
-index 5f88a46..6f49788 100644
+index 5f88a46..7e0ecb1 100644
 --- a/ffplay.c
 +++ b/ffplay.c
 @@ -30,6 +30,8 @@
@@ -120,13 +120,13 @@ index 5f88a46..6f49788 100644
 +                        if (!propst->codec->codec) {
 +                            AVCodec *codec = avcodec_find_decoder(propst->codec->codec_id);
 +                            if (!codec) {
-+                                fprintf(stderr, "output_packet: Decoder (codec id %d) not found for input stream #%d\n",
-+                                        propst->codec->codec_id, propst->index);
++                                av_log(propst->codec, AV_LOG_ERROR, "Decoder (codec id %d) not found for input stream #%d\n",
++                                       propst->codec->codec_id, propst->index);
 +                                return AVERROR(EINVAL);
 +                            }
 +                            if (avcodec_open(propst->codec, codec) < 0) {
-+                                fprintf(stderr, "output_packet: Error while opening decoder for input stream #%d\n",
-+                                        propst->index);
++                                av_log(propst->codec, AV_LOG_ERROR, "Error while opening decoder for input stream #%d\n",
++                                       propst->index);
 +                                return AVERROR(EINVAL);
 +                            }
 +                        }