[FFmpeg-cvslog] avcodec/pcm-dvd: fix incorrectly printed warning about changed block sizes

Michael Niedermayer git at videolan.org
Mon Nov 18 21:06:49 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 18 20:58:35 2013 +0100| [4adf1fe34f179af0b891d4f69857964f30a318ee] | committer: Michael Niedermayer

avcodec/pcm-dvd: fix incorrectly printed warning about changed block sizes

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/pcm-dvd.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/pcm-dvd.c b/libavcodec/pcm-dvd.c
index 243b6aa..b268f1e 100644
--- a/libavcodec/pcm-dvd.c
+++ b/libavcodec/pcm-dvd.c
@@ -248,7 +248,7 @@ static int pcm_dvd_decode_frame(AVCodecContext *avctx, void *data,
 
     if ((retval = pcm_dvd_parse_header(avctx, src)))
         return retval;
-    if (s->last_block_size != s->block_size) {
+    if (s->last_block_size && s->last_block_size != s->block_size) {
         av_log(avctx, AV_LOG_WARNING, "block_size has changed\n");
         s->extra_sample_count = 0;
     }



More information about the ffmpeg-cvslog mailing list