Merge commit 'b19a5e51981be5b69cf550a3bc17fe5300d0dbc9'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 11:34:35 +0000 (13:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 11:34:43 +0000 (13:34 +0200)
* commit 'b19a5e51981be5b69cf550a3bc17fe5300d0dbc9':
  lavc: improve AVCodecContext.delay doxy

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

Simple merge