Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
830b5cc3
Commit
830b5cc3
authored
Sep 11, 2023
by
Andreas Rheinhardt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat: Inline raw_codec_id where known
Signed-off-by:
Andreas Rheinhardt
<
andreas.rheinhardt@outlook.com
>
parent
d0b03b41
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
7 additions
and
7 deletions
+7
-7
aacdec.c
libavformat/aacdec.c
+1
-1
adxdec.c
libavformat/adxdec.c
+1
-1
dfpwmdec.c
libavformat/dfpwmdec.c
+1
-1
gsmdec.c
libavformat/gsmdec.c
+1
-1
loasdec.c
libavformat/loasdec.c
+1
-1
serdec.c
libavformat/serdec.c
+1
-1
wsddec.c
libavformat/wsddec.c
+1
-1
No files found.
libavformat/aacdec.c
View file @
830b5cc3
...
...
@@ -113,7 +113,7 @@ static int adts_aac_read_header(AVFormatContext *s)
return
AVERROR
(
ENOMEM
);
st
->
codecpar
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codecpar
->
codec_id
=
s
->
iformat
->
raw_codec_id
;
st
->
codecpar
->
codec_id
=
AV_CODEC_ID_AAC
;
ffstream
(
st
)
->
need_parsing
=
AVSTREAM_PARSE_FULL_RAW
;
ff_id3v1_read
(
s
);
...
...
libavformat/adxdec.c
View file @
830b5cc3
...
...
@@ -120,7 +120,7 @@ static int adx_read_header(AVFormatContext *s)
par
->
ch_layout
.
nb_channels
=
channels
;
par
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
par
->
codec_id
=
s
->
iformat
->
raw_codec_id
;
par
->
codec_id
=
AV_CODEC_ID_ADPCM_ADX
;
par
->
bit_rate
=
(
int64_t
)
par
->
sample_rate
*
par
->
ch_layout
.
nb_channels
*
BLOCK_SIZE
*
8LL
/
BLOCK_SAMPLES
;
avpriv_set_pts_info
(
st
,
64
,
BLOCK_SAMPLES
,
par
->
sample_rate
);
...
...
libavformat/dfpwmdec.c
View file @
830b5cc3
...
...
@@ -50,7 +50,7 @@ static int dfpwm_read_header(AVFormatContext *s)
par
=
st
->
codecpar
;
par
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
par
->
codec_id
=
s
->
iformat
->
raw_codec_id
;
par
->
codec_id
=
AV_CODEC_ID_DFPWM
;
par
->
sample_rate
=
s1
->
sample_rate
;
#if FF_API_OLD_CHANNEL_LAYOUT
if
(
s1
->
ch_layout
.
nb_channels
)
{
...
...
libavformat/gsmdec.c
View file @
830b5cc3
...
...
@@ -78,7 +78,7 @@ static int gsm_read_header(AVFormatContext *s)
return
AVERROR
(
ENOMEM
);
st
->
codecpar
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codecpar
->
codec_id
=
s
->
iformat
->
raw_codec_id
;
st
->
codecpar
->
codec_id
=
AV_CODEC_ID_GSM
;
st
->
codecpar
->
ch_layout
=
(
AVChannelLayout
)
AV_CHANNEL_LAYOUT_MONO
;
st
->
codecpar
->
sample_rate
=
c
->
sample_rate
;
st
->
codecpar
->
bit_rate
=
GSM_BLOCK_SIZE
*
8
*
c
->
sample_rate
/
GSM_BLOCK_SAMPLES
;
...
...
libavformat/loasdec.c
View file @
830b5cc3
...
...
@@ -74,7 +74,7 @@ static int loas_read_header(AVFormatContext *s)
return
AVERROR
(
ENOMEM
);
st
->
codecpar
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codecpar
->
codec_id
=
s
->
iformat
->
raw_codec_id
;
st
->
codecpar
->
codec_id
=
AV_CODEC_ID_AAC_LATM
;
ffstream
(
st
)
->
need_parsing
=
AVSTREAM_PARSE_FULL_RAW
;
//LCM of all possible AAC sample rates
...
...
libavformat/serdec.c
View file @
830b5cc3
...
...
@@ -80,7 +80,7 @@ static int ser_read_header(AVFormatContext *s)
}
st
->
codecpar
->
codec_type
=
AVMEDIA_TYPE_VIDEO
;
st
->
codecpar
->
codec_id
=
s
->
iformat
->
raw_codec_id
;
st
->
codecpar
->
codec_id
=
AV_CODEC_ID_RAWVIDEO
;
avpriv_set_pts_info
(
st
,
64
,
ser
->
framerate
.
den
,
ser
->
framerate
.
num
);
...
...
libavformat/wsddec.c
View file @
830b5cc3
...
...
@@ -125,7 +125,7 @@ static int wsd_read_header(AVFormatContext *s)
av_dict_set
(
&
s
->
metadata
,
"playback_time"
,
playback_time
,
0
);
st
->
codecpar
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codecpar
->
codec_id
=
s
->
iformat
->
raw_codec_id
;
st
->
codecpar
->
codec_id
=
AV_CODEC_ID_DSD_MSBF
;
st
->
codecpar
->
sample_rate
=
avio_rb32
(
pb
)
/
8
;
avio_skip
(
pb
,
4
);
st
->
codecpar
->
ch_layout
.
nb_channels
=
avio_r8
(
pb
)
&
0xF
;
...
...
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