har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffm: do not write or read the audio sample format

Browse Source
This commit is contained in:
Justin Ruggles 2012-10-01 01:24:57 -04:00
parent 6221e2478c
commit 11dcddb97b
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/ffmdec.c
View File

@ -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;

1
libavformat/ffmenc.c
View File

@ -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;

2
tests/ref/lavf/ffm
View File

@ -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