[FFmpeg-cvslog] framecrcenc: print all side data elements, not just the first

Michael Niedermayer git at videolan.org
Wed Feb 6 18:25:02 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  6 18:17:27 2013 +0100| [864fdfa0627e21ee0b69e957c3413114185623a7] | committer: Michael Niedermayer

framecrcenc: print all side data elements, not just the first

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

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

 libavformat/framecrcenc.c |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c
index 29960f9..92f2e91 100644
--- a/libavformat/framecrcenc.c
+++ b/libavformat/framecrcenc.c
@@ -34,11 +34,15 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt)
     if (pkt->flags != AV_PKT_FLAG_KEY)
         av_strlcatf(buf, sizeof(buf), ", F=0x%0X", pkt->flags);
     if (pkt->side_data_elems) {
-        uint32_t side_data_crc = av_adler32_update(0,
-                                                   pkt->side_data->data,
-                                                   pkt->side_data->size);
+        int i;
         av_strlcatf(buf, sizeof(buf), ", S=%d", pkt->side_data_elems);
-        av_strlcatf(buf, sizeof(buf), ", %8d, 0x%08x", pkt->side_data->size, side_data_crc);
+
+        for (i=0; i<pkt->side_data_elems; i++) {
+            uint32_t side_data_crc = av_adler32_update(0,
+                                                    pkt->side_data[i].data,
+                                                    pkt->side_data[i].size);
+            av_strlcatf(buf, sizeof(buf), ", %8d, 0x%08x", pkt->side_data[i].size, side_data_crc);
+        }
     }
     av_strlcatf(buf, sizeof(buf), "\n");
     avio_write(s->pb, buf, strlen(buf));



More information about the ffmpeg-cvslog mailing list