Merge commit 'c7247eb7fe2b95803983e8f7c4f0e904f050ca7b'

[ffmpeg] / ffmpeg.c

diff --git a/ffmpeg.c b/ffmpeg.c
index d9b8c0bffffb27213ce7e0bdfc56be55d916962a..e31a2c6092054e22bf08654b732e35231c55a521 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -692,13 +692,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
                                            &new_pkt.data, &new_pkt.size,
                                            pkt->data, pkt->size,
                                            pkt->flags & AV_PKT_FLAG_KEY);
-FF_DISABLE_DEPRECATION_WARNINGS
-        if(a == 0 && new_pkt.data != pkt->data
-#if FF_API_DESTRUCT_PACKET
-           && new_pkt.destruct
-#endif
-           ) {
-FF_ENABLE_DEPRECATION_WARNINGS
+        if(a == 0 && new_pkt.data != pkt->data) {
             uint8_t *t = av_malloc(new_pkt.size + AV_INPUT_BUFFER_PADDING_SIZE); //the new should be a subset of the old so cannot overflow
             if(t) {
                 memcpy(t, new_pkt.data, new_pkt.size);
@@ -2602,7 +2596,6 @@ static int init_output_stream(OutputStream *ost, char *error, int error_len)
         }
         if (!av_dict_get(ost->encoder_opts, "threads", NULL, 0))
             av_dict_set(&ost->encoder_opts, "threads", "auto", 0);
-        av_dict_set(&ost->encoder_opts, "side_data_only_packets", "1", 0);
         if (ost->enc->type == AVMEDIA_TYPE_AUDIO &&
             !codec->defaults &&
             !av_dict_get(ost->encoder_opts, "b", NULL, 0) &&