Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 824f98f442996eaee9204b132752cf5114fc94cf)
Originally committed as revision 17716 to svn://svn.ffmpeg.org/ffmpeg/trunk
Patch by Gregory Montoir <cyx <at> users <dot> sourceforge <dot> net> Originally committed as revision 14146 to svn://svn.ffmpeg.org/ffmpeg/trunk