[FFmpeg-cvslog] matroskadec: simplify additional_id writing code

Michael Niedermayer git at videolan.org
Thu Feb 14 01:00:51 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 14 00:55:25 2013 +0100| [a08ebf04b1b06e6182f227561e48efac36b11a6d] | committer: Michael Niedermayer

matroskadec: simplify additional_id writing code

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

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

 libavformat/matroskadec.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 94079ab..3519a13 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2131,13 +2131,11 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska,
     if (additional_size > 0) {
         uint8_t *side_data = av_packet_new_side_data(pkt,
                                                      AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
-                                                     additional_size + sizeof(additional_id));
-        uint8_t additional_id_buf[8];
+                                                     additional_size + 8);
         if(side_data == NULL) {
             return AVERROR(ENOMEM);
         }
-        AV_WB64(additional_id_buf, additional_id);
-        memcpy(side_data, additional_id_buf, 8);
+        AV_WB64(side_data, additional_id);
         memcpy(side_data + 8, additional, additional_size);
     }
 



More information about the ffmpeg-cvslog mailing list