[FFmpeg-cvslog] avformat, avcodec: log discard padding

[wm4]

ffmpeg | branch: master | wm4 <nfxjfg at googlemail.com> | Tue Apr 14 21:24:33 2015 +0200| [2b5f34f788d8419c39c9108e1ab1f5fa0d0f3e0d] | committer: Michael Niedermayer

avformat, avcodec: log discard padding

Useful for debugging.

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

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

 libavcodec/utils.c  |    4 ++--
 libavformat/utils.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 99f254b..d2b8631 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -2549,9 +2549,9 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx,
         side= av_packet_get_side_data(avctx->internal->pkt, AV_PKT_DATA_SKIP_SAMPLES, &side_size);
         if(side && side_size>=10) {
             avctx->internal->skip_samples = AV_RL32(side);
-            av_log(avctx, AV_LOG_DEBUG, "skip %d samples due to side data\n",
-                   avctx->internal->skip_samples);
             discard_padding = AV_RL32(side + 4);
+            av_log(avctx, AV_LOG_DEBUG, "skip %d / discard %d samples due to side data\n",
+                   avctx->internal->skip_samples, (int)discard_padding);
             skip_reason = AV_RL8(side + 8);
             discard_reason = AV_RL8(side + 9);
         }
diff --git a/libavformat/utils.c b/libavformat/utils.c
index c6e4627..a7440f5 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1415,7 +1415,7 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
             if (p) {
                 AV_WL32(p, st->skip_samples);
                 AV_WL32(p + 4, discard_padding);
-                av_log(s, AV_LOG_DEBUG, "demuxer injecting skip %d\n", st->skip_samples);
+                av_log(s, AV_LOG_DEBUG, "demuxer injecting skip %d / discard %d\n", st->skip_samples, discard_padding);
             }
             st->skip_samples = 0;
         }