* Eliminate compiler warning
* Add the codec name if we have it

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