Module: libav Branch: master Commit: 11dcddb97bdb2e9eb65ddcd736fc01e87961f92b
Author: Justin Ruggles <[email protected]> Committer: Justin Ruggles <[email protected]> Date: Mon Oct 1 01:24:57 2012 -0400 ffm: do not write or read the audio sample format --- libavformat/ffmdec.c | 1 - libavformat/ffmenc.c | 1 - tests/ref/lavf/ffm | 2 +- 3 files changed, 1 insertions(+), 3 deletions(-) diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 8929657..50c7416 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 c020672..386487f 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; diff --git a/tests/ref/lavf/ffm b/tests/ref/lavf/ffm index b95eb8b..8921544 100644 --- a/tests/ref/lavf/ffm +++ b/tests/ref/lavf/ffm @@ -1,3 +1,3 @@ -0063b1b49d8641dcbf354092529a58a4 *./tests/data/lavf/lavf.ffm +c5dcf5950031020864db57bbde0064df *./tests/data/lavf/lavf.ffm 376832 ./tests/data/lavf/lavf.ffm ./tests/data/lavf/lavf.ffm CRC=0x38388ba1 _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
