Merge commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 08:45:13 +0000 (10:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 08:45:13 +0000 (10:45 +0200)
commit67a580f423f23565d885462857494d03a28cc2f1
tree7132bc2430b9b6b4c3b156d8882df0abc96c73f0
parent921c1d4c95a828167342095e77bbacfad25db686
parent5a9a9d4a2abefa63d9a898ce26715453c569e89d
Merge commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d'

* commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d':
  lavc: Add refcounted api to AVPacket

Conflicts:
libavcodec/avpacket.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/avpacket.c
libavcodec/version.h