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)
* commit 'bb7701684c7170dfd5f33a3c7d827265844619f2':
  lavf: Document the codec context initialization

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

Simple merge