Merge commit 'f758ea6e99af6ebd24bbe222898a921c222e5593'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Feb 2014 02:48:50 +0000 (03:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 15 Feb 2014 03:03:09 +0000 (04:03 +0100)
commitefe4a06929a885c740a255c42a746758cd60e97f
treec7e57af4905ef936852b2d3ebe14c722d73ff6df
parentb8664c929437d6d079e16979c496a2db40cf2324
parentf758ea6e99af6ebd24bbe222898a921c222e5593
Merge commit 'f758ea6e99af6ebd24bbe222898a921c222e5593'

* commit 'f758ea6e99af6ebd24bbe222898a921c222e5593':
  buffersink: document special error codes returned from av_buffersink_get_frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/buffersink.h