[FFmpeg-cvslog] Merge commit 'f758ea6e99af6ebd24bbe222898a921c222e5593'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 15 03:48:50 2014 +0100| [efe4a06929a885c740a255c42a746758cd60e97f] | committer: Michael Niedermayer

Merge commit 'f758ea6e99af6ebd24bbe222898a921c222e5593'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efe4a06929a885c740a255c42a746758cd60e97f
---