Merge commit '9b56d5c11488656254e9aed8d964ef2b7c2ff5e6'

* commit '9b56d5c11488656254e9aed8d964ef2b7c2ff5e6':
  avpacket: Deprecate av_dup_packet

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc doc/APIchanges
index c55dfe8,0c5d141..efdb81c
--- 1/doc/APIchanges
--- 2/doc/APIchanges
+++ b/doc/APIchanges
@@@ -15,14 -13,13 +15,16 @@@ libavutil:     2015-08-2
  
  API changes, most recent first:
  
 -2015-xx-xx - lavc 57.7.0 - avcodec.h
++2015-10-29 - lavc 57.12.100 / 57.8.0 - avcodec.h
+   xxxxxx - Deprecate av_free_packet(). Use av_packet_unref() as replacement,
+            it resets the packet in a more consistent way.
+   xxxxxx - Deprecate av_dup_packet(), it is a no-op for most cases.
+            Use av_packet_ref() to make a non-refcounted AVPacket refcounted.
+ 
 -2015-xx-xx - xxxxxxx - lavc 57.5.0 - avcodec.h
 +2015-10-27 - xxxxxxx - lavu 55.5.100 - cpu.h
 +  Add AV_CPU_FLAG_AESNI.
 +
- 2015-10-27 - xxxxxxx - lavc 57.12.100 / 57.8.0 - avcodec.h
-   Deprecate av_free_packet(). Use av_packet_unref() as replacement,
-   it resets the packet in a more consistent way.
- 
 +2015-10-22 - xxxxxxx - lavc 57.9.100 / lavc 57.5.0 - avcodec.h
    Add data and linesize array to AVSubtitleRect, to be used instead of
    the ones from the embedded AVPicture.
  

diff --cc libavcodec/avcodec.h
index c4104cf,9eaa2c6..936d9fe
--- 1/libavcodec/avcodec.h
--- 2/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@@ -3901,24 -3480,12 +3902,26 @@@ int av_packet_from_data(AVPacket *pkt, 
  /**
   * @warning This is a hack - the packet memory allocation stuff is broken. The
   * packet is allocated if it was not really allocated.
+  *
+  * @deprecated Use av_packet_ref
   */
+ attribute_deprecated
  int av_dup_packet(AVPacket *pkt);
- #if FF_API_AVPACKET_OLD_API
  /**
 + * Copy packet, including contents
 + *
 + * @return 0 on success, negative AVERROR on fail
 + */
 +int av_copy_packet(AVPacket *dst, const AVPacket *src);
 +
 +/**
 + * Copy packet side data
 + *
 + * @return 0 on success, negative AVERROR on fail
 + */
 +int av_copy_packet_side_data(AVPacket *dst, const AVPacket *src);
 +
 +/**
   * Free a packet.
   *
   * @deprecated Use av_packet_unref

diff --cc libavcodec/avpacket.c
index a87150e,cec5bf8..34ef265
--- 1/libavcodec/avpacket.c
--- 2/libavcodec/avpacket.c
+++ b/libavcodec/avpacket.c
@@@ -207,24 -189,9 +209,26 @@@ failed_alloc
      av_packet_unref(pkt);
      return AVERROR(ENOMEM);
  }
+ FF_ENABLE_DEPRECATION_WARNINGS
+ #endif
  
 +int av_dup_packet(AVPacket *pkt)
 +{
 +    AVPacket tmp_pkt;
 +
 +    if (!pkt->buf && pkt->data) {
 +        tmp_pkt = *pkt;
 +        return copy_packet_data(pkt, &tmp_pkt, 1);
 +    }
 +    return 0;
 +}
 +
 +int av_copy_packet(AVPacket *dst, const AVPacket *src)
 +{
 +    *dst = *src;
 +    return copy_packet_data(dst, src, 0);
 +}
 +
  void av_packet_free_side_data(AVPacket *pkt)
  {
      int i;

diff --cc libavformat/matroskaenc.c
index b41888f,baffd54..10cf0a0
--- 1/libavformat/matroskaenc.c
--- 2/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@@ -1945,17 -1608,9 +1945,9 @@@ static int mkv_write_packet(AVFormatCon
      // buffer an audio packet to ensure the packet containing the video
      // keyframe's timecode is contained in the same cluster for WebM
      if (codec_type == AVMEDIA_TYPE_AUDIO) {
-         mkv->cur_audio_pkt = *pkt;
-         if (pkt->buf) {
-             mkv->cur_audio_pkt.buf = av_buffer_ref(pkt->buf);
-             ret = mkv->cur_audio_pkt.buf ? 0 : AVERROR(ENOMEM);
-         } else
-             ret = av_dup_packet(&mkv->cur_audio_pkt);
-         if (mkv->cur_audio_pkt.side_data_elems > 0) {
-             ret = av_copy_packet_side_data(&mkv->cur_audio_pkt, &mkv->cur_audio_pkt);
-         }
+         ret = av_packet_ref(&mkv->cur_audio_pkt, pkt);
      } else
 -        ret = mkv_write_packet_internal(s, pkt);
 +        ret = mkv_write_packet_internal(s, pkt, 0);
      return ret;
  }
  

diff --cc libavformat/mux.c
index b2d843b,4a81e36..bf7a472
--- 1/libavformat/mux.c
--- 2/libavformat/mux.c
+++ b/libavformat/mux.c
@@@ -740,19 -416,10 +740,14 @@@ int ff_interleave_add_packet(AVFormatCo
      this_pktl      = av_mallocz(sizeof(AVPacketList));
      if (!this_pktl)
          return AVERROR(ENOMEM);
-     this_pktl->pkt = *pkt;
-     pkt->buf       = NULL;
-     pkt->side_data = NULL;
-     pkt->side_data_elems = 0;
 +    if ((pkt->flags & AV_PKT_FLAG_UNCODED_FRAME)) {
 +        av_assert0(pkt->size == UNCODED_FRAME_PACKET_SIZE);
 +        av_assert0(((AVFrame *)pkt->data)->buf);
-     } else {
-         // Duplicate the packet if it uses non-allocated memory
-         if ((ret = av_dup_packet(&this_pktl->pkt)) < 0) {
-             av_free(this_pktl);
-             return ret;
-         }
++    }
+ 
+     if ((ret = av_packet_ref(&this_pktl->pkt, pkt)) < 0) {
+         av_free(this_pktl);
+         return ret;
      }
  
      if (s->streams[pkt->stream_index]->last_in_packet_buffer) {