Merge commit 'b72727a5248f1ef02db99b378dce1eb48a46357a'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 23:51:10 +0000 (00:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 23:52:42 +0000 (00:52 +0100)
* commit 'b72727a5248f1ef02db99b378dce1eb48a46357a':
  lavc: mention that the parser callback never returns an error

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

Simple merge