Merge commit '9b56d5c11488656254e9aed8d964ef2b7c2ff5e6'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 29 Oct 2015 13:16:44 +0000 (14:16 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 29 Oct 2015 13:16:44 +0000 (14:16 +0100)
commit87a6f532b46fb16eea07943325f5d322d08e13ed
tree26b4b24c5f3839c4aa7e66979870eb9ed98ddd00
parent54de179caa39e1c2f3cbea61dd05f818bb78a3b6
parent9b56d5c11488656254e9aed8d964ef2b7c2ff5e6
Merge commit '9b56d5c11488656254e9aed8d964ef2b7c2ff5e6'

* commit '9b56d5c11488656254e9aed8d964ef2b7c2ff5e6':
  avpacket: Deprecate av_dup_packet

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/avpacket.c
libavformat/matroskaenc.c
libavformat/mux.c