Signed-off-by: Mans Rullgard <mans@mansr.com>
Originally committed as revision 19690 to svn://svn.ffmpeg.org/ffmpeg/trunk
Originally committed as revision 19682 to svn://svn.ffmpeg.org/ffmpeg/trunk