Fix breakage introduced by setting the sample_fmt to SAMPLE_FMT_NONE (r20623). This makes

streaming to ffserver work again.

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

libavformat/ffmdec.c

@@ -354,6 +354,7 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
             codec->sample_rate = get_be32(pb);
             codec->channels = get_le16(pb);
             codec->frame_size = get_le16(pb);
+            codec->sample_fmt = get_le16(pb);
             break;
         default:
             goto fail;

libavformat/ffmenc.c

@@ -172,6 +172,7 @@ static int ffm_write_header(AVFormatContext *s)
             put_be32(pb, codec->sample_rate);
             put_le16(pb, codec->channels);
             put_le16(pb, codec->frame_size);
+            put_le16(pb, codec->sample_fmt);
             break;
         default:
             return -1;