[FFmpeg-cvslog] r20869 - in trunk/libavformat: ffmdec.c ffmenc.c

[banan]

Author: banan
Date: Mon Dec 14 22:08:21 2009
New Revision: 20869

Log:
Fix breakage introduced by setting the sample_fmt to SAMPLE_FMT_NONE (r20623). This makes
streaming to ffserver work again.

Modified:
   trunk/libavformat/ffmdec.c
   trunk/libavformat/ffmenc.c

Modified: trunk/libavformat/ffmdec.c
==============================================================================
--- trunk/libavformat/ffmdec.c	Mon Dec 14 20:28:33 2009	(r20868)
+++ trunk/libavformat/ffmdec.c	Mon Dec 14 22:08:21 2009	(r20869)
@@ -354,6 +354,7 @@ static int ffm_read_header(AVFormatConte
             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;

Modified: trunk/libavformat/ffmenc.c
==============================================================================
--- trunk/libavformat/ffmenc.c	Mon Dec 14 20:28:33 2009	(r20868)
+++ trunk/libavformat/ffmenc.c	Mon Dec 14 22:08:21 2009	(r20869)
@@ -172,6 +172,7 @@ static int ffm_write_header(AVFormatCont
             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;