[FFmpeg-cvslog] Merge commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 11 10:45:13 2013 +0200| [67a580f423f23565d885462857494d03a28cc2f1] | committer: Michael Niedermayer

Merge commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d'

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

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67a580f423f23565d885462857494d03a28cc2f1
---