ffmpeg: don't unnecessarily use a deprecated API function
authorwm4 <nfxjfg@googlemail.com>
Thu, 16 Mar 2017 04:18:59 +0000 (05:18 +0100)
committerwm4 <nfxjfg@googlemail.com>
Tue, 21 Mar 2017 05:16:49 +0000 (06:16 +0100)
Since we've disabled side data merging in ffmpeg.c, this really changes
nothing.

ffmpeg.c

index dbfb14b..dcb7720 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -818,7 +818,6 @@ static void output_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost)
     if (ost->nb_bitstream_filters) {
         int idx;
 
-        av_packet_split_side_data(pkt);
         ret = av_bsf_send_packet(ost->bsf_ctx[0], pkt);
         if (ret < 0)
             goto finish;
@@ -4247,8 +4246,6 @@ static int process_input(int file_index)
 
     /* add the stream-global side data to the first packet */
     if (ist->nb_packets == 1) {
-        if (ist->st->nb_side_data)
-            av_packet_split_side_data(&pkt);
         for (i = 0; i < ist->st->nb_side_data; i++) {
             AVPacketSideData *src_sd = &ist->st->side_data[i];
             uint8_t *dst_data;