Merge commit 'bb7701684c7170dfd5f33a3c7d827265844619f2'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 20:26:00 +0000 (21:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 20:26:04 +0000 (21:26 +0100)
commit563ed912eaac481b1b46f5dd3e2ab71df7fde305
tree67ff96bc286f66196447df841affe1bc24e352c7
parent2980c8e7d34e84f98b09965d208a583a16d5aded
parentbb7701684c7170dfd5f33a3c7d827265844619f2
Merge commit 'bb7701684c7170dfd5f33a3c7d827265844619f2'

* commit 'bb7701684c7170dfd5f33a3c7d827265844619f2':
  lavf: Document the codec context initialization

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avformat.h