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)
commit5e6be52bacb907492f71f7d57978fe10cb278c4c
treeca2186d0ea73df4fb8cb8faf9010cc88ff2aa31b
parent57123dc67e7768d31e394a9b97bb26831b63bc24
parentb19a5e51981be5b69cf550a3bc17fe5300d0dbc9
Merge commit 'b19a5e51981be5b69cf550a3bc17fe5300d0dbc9'

* commit 'b19a5e51981be5b69cf550a3bc17fe5300d0dbc9':
  lavc: improve AVCodecContext.delay doxy

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