changeset 5463:08abadf5350b libavformat

Fix breakage introduced by setting the sample_fmt to SAMPLE_FMT_NONE (r20623). This makes streaming to ffserver work again.
author banan
date Mon, 14 Dec 2009 21:08:21 +0000
parents 60e08f8038bd
children ab9e31e90d3c
files ffmdec.c ffmenc.c
diffstat 2 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ffmdec.c	Mon Dec 14 15:59:19 2009 +0000
+++ b/ffmdec.c	Mon Dec 14 21:08:21 2009 +0000
@@ -354,6 +354,7 @@
             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;
--- a/ffmenc.c	Mon Dec 14 15:59:19 2009 +0000
+++ b/ffmenc.c	Mon Dec 14 21:08:21 2009 +0000
@@ -172,6 +172,7 @@
             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;