Proper fix for the corner case that would have been corrected before, praise&blame to me and exg in equal shares

Originally committed as revision 6143 to svn://svn.ffmpeg.org/ffmpeg/trunk