Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
ffmpeg
Commits
11dcddb9
Commit
11dcddb9
authored
Oct 01, 2012
by
Justin Ruggles
Browse files
ffm: do not write or read the audio sample format
parent
6221e247
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
3 deletions
+1
-3
libavformat/ffmdec.c
libavformat/ffmdec.c
+0
-1
libavformat/ffmenc.c
libavformat/ffmenc.c
+0
-1
tests/ref/lavf/ffm
tests/ref/lavf/ffm
+1
-1
No files found.
libavformat/ffmdec.c
View file @
11dcddb9
...
...
@@ -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
;
...
...
libavformat/ffmenc.c
View file @
11dcddb9
...
...
@@ -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
;
...
...
tests/ref/lavf/ffm
View file @
11dcddb9
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment