diff options
| author | Michael Niedermayer <[email protected]> | 2013-08-11 10:45:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-08-11 10:45:13 +0200 |
| commit | 67a580f423f23565d885462857494d03a28cc2f1 (patch) | |
| tree | 7132bc2430b9b6b4c3b156d8882df0abc96c73f0 /libavformat/rtmpproto.c | |
| parent | 921c1d4c95a828167342095e77bbacfad25db686 (diff) | |
| parent | 5a9a9d4a2abefa63d9a898ce26715453c569e89d (diff) | |
Merge commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d'
* commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d':
lavc: Add refcounted api to AVPacket
Conflicts:
libavcodec/avpacket.c
libavcodec/version.h
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/rtmpproto.c')
0 files changed, 0 insertions, 0 deletions