Merge commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 18:43:11 +0000 (20:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 18:43:11 +0000 (20:43 +0200)
commita561662fb7223cb98907744e03398848a0d362e1
tree23720ae7eb8ba20c8bc6c2db995b977d93433115
parent2bf87dcc2d3079ead09b250df6932c94ff13504c
parentad1ee5fa75a3d69d54c0691048939e94ab5a7f0d
Merge commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d'

* commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d':
  avcodec: Undeprecate reordered_opaque

Conflicts:
doc/APIchanges
libavcodec/version.h

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