summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2012-10-01 01:24:57 -0400
committerJustin Ruggles <justin.ruggles@gmail.com>2012-10-06 12:21:54 -0400
commit11dcddb97bdb2e9eb65ddcd736fc01e87961f92b (patch)
tree2125874be1b6394e2d92075069236640d076dc38 /libavformat
parent6221e2478c593a0ce1183eed929cb2101dbf5265 (diff)
ffm: do not write or read the audio sample format
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/ffmdec.c1
-rw-r--r--libavformat/ffmenc.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index 8929657784..50c7416811 100644
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -354,7 +354,6 @@ static int ffm_read_header(AVFormatContext *s)
codec->sample_rate = avio_rb32(pb);
codec->channels = avio_rl16(pb);
codec->frame_size = avio_rl16(pb);
- codec->sample_fmt = (int16_t) avio_rl16(pb);
break;
default:
goto fail;
diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c
index c020672bf1..386487f1f9 100644
--- a/libavformat/ffmenc.c
+++ b/libavformat/ffmenc.c
@@ -170,7 +170,6 @@ static int ffm_write_header(AVFormatContext *s)
avio_wb32(pb, codec->sample_rate);
avio_wl16(pb, codec->channels);
avio_wl16(pb, codec->frame_size);
- avio_wl16(pb, codec->sample_fmt);
break;
default:
return -1;