Merge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 12:27:33 +0000 (13:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 12:27:33 +0000 (13:27 +0100)
commitbd34e26b27e9ec83727dedd1c04c40d8a245cfa8
treeb1b9eebb64b644361b38aae2fa00fb2a6b9cfb40
parent9456a8628b4054d11c0b652ee0d4f1b61c3b9464
parent0e2c3ee9a335d8a0a5edf0509e222e804d7b2619
Merge commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619'

* commit '0e2c3ee9a335d8a0a5edf0509e222e804d7b2619':
  lavc: give a typedeffed name to the AVPacket.side_data struct

Conflicts:
doc/APIchanges
libavcodec/version.h

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