Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
0d29b7d5
Commit
0d29b7d5
authored
Jan 27, 2009
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add {} between if/else
Originally committed as revision 16837 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
9913860b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
4xm.c
libavformat/4xm.c
+7
-7
No files found.
libavformat/4xm.c
View file @
0d29b7d5
...
...
@@ -205,11 +205,11 @@ static int fourxm_read_header(AVFormatContext *s,
st
->
codec
->
bit_rate
=
st
->
codec
->
channels
*
st
->
codec
->
sample_rate
*
st
->
codec
->
bits_per_coded_sample
;
st
->
codec
->
block_align
=
st
->
codec
->
channels
*
st
->
codec
->
bits_per_coded_sample
;
if
(
fourxm
->
tracks
[
current_track
].
adpcm
)
if
(
fourxm
->
tracks
[
current_track
].
adpcm
)
{
st
->
codec
->
codec_id
=
CODEC_ID_ADPCM_4XM
;
else
if
(
st
->
codec
->
bits_per_coded_sample
==
8
)
}
else
if
(
st
->
codec
->
bits_per_coded_sample
==
8
){
st
->
codec
->
codec_id
=
CODEC_ID_PCM_U8
;
else
}
else
st
->
codec
->
codec_id
=
CODEC_ID_PCM_S16LE
;
}
}
...
...
@@ -279,9 +279,9 @@ static int fourxm_read_packet(AVFormatContext *s,
memcpy
(
pkt
->
data
,
header
,
8
);
ret
=
get_buffer
(
s
->
pb
,
&
pkt
->
data
[
8
],
size
);
if
(
ret
<
0
)
if
(
ret
<
0
)
{
av_free_packet
(
pkt
);
else
}
else
packet_read
=
1
;
break
;
...
...
@@ -306,9 +306,9 @@ static int fourxm_read_packet(AVFormatContext *s,
2
*
(
fourxm
->
tracks
[
track_number
].
channels
);
audio_frame_count
/=
fourxm
->
tracks
[
track_number
].
channels
;
if
(
fourxm
->
tracks
[
track_number
].
adpcm
)
if
(
fourxm
->
tracks
[
track_number
].
adpcm
)
{
audio_frame_count
*=
2
;
else
}
else
audio_frame_count
/=
(
fourxm
->
tracks
[
track_number
].
bits
/
8
);
fourxm
->
tracks
[
track_number
].
audio_pts
+=
audio_frame_count
;
...
...
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