[FFmpeg-cvslog] oggdec: improve warning message.

Reimar Döffinger git at videolan.org
Sat Feb 18 21:36:15 CET 2012


ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Sat Feb 18 21:19:58 2012 +0100| [030e96fe5566d9dd412540d258f05f907a86651f] | committer: Reimar Döffinger

oggdec: improve warning message.

Print whether it was a keyframe or a non-keyframe that
was incorrectly marked as the other.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>

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

 libavformat/oggdec.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index e32ab69..39f99e5 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -582,8 +582,9 @@ static void ogg_validate_keyframe(AVFormatContext *s, int idx, int pstart, int p
     struct ogg_stream *os = ogg->streams + idx;
     if (psize && s->streams[idx]->codec->codec_id == CODEC_ID_THEORA) {
         if (!!(os->pflags & AV_PKT_FLAG_KEY) != !(os->buf[pstart] & 0x40)) {
-            av_log(s, AV_LOG_WARNING, "Broken file, keyframes not correctly marked.\n");
             os->pflags ^= AV_PKT_FLAG_KEY;
+            av_log(s, AV_LOG_WARNING, "Broken file, %skeyframe not correctly marked.\n",
+                   (os->pflags & AV_PKT_FLAG_KEY) ? "" : "non-");
         }
     }
 }



More information about the ffmpeg-cvslog mailing list