Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
e9025bea
Commit
e9025bea
authored
Nov 13, 2017
by
James Almer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: remove usage of AVCodecContext accessors
Signed-off-by:
James Almer
<
jamrial@gmail.com
>
parent
c4131a06
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
ffmpeg.c
fftools/ffmpeg.c
+1
-1
ffmpeg_opt.c
fftools/ffmpeg_opt.c
+3
-3
No files found.
fftools/ffmpeg.c
View file @
e9025bea
...
@@ -2877,7 +2877,7 @@ static int init_input_stream(int ist_index, char *error, int error_len)
...
@@ -2877,7 +2877,7 @@ static int init_input_stream(int ist_index, char *error, int error_len)
/* Useful for subtitles retiming by lavf (FIXME), skipping samples in
/* Useful for subtitles retiming by lavf (FIXME), skipping samples in
* audio, and video decoders such as cuvid or mediacodec */
* audio, and video decoders such as cuvid or mediacodec */
av_codec_set_pkt_timebase
(
ist
->
dec_ctx
,
ist
->
st
->
time_base
)
;
ist
->
dec_ctx
->
pkt_timebase
=
ist
->
st
->
time_base
;
if
(
!
av_dict_get
(
ist
->
decoder_opts
,
"threads"
,
NULL
,
0
))
if
(
!
av_dict_get
(
ist
->
decoder_opts
,
"threads"
,
NULL
,
0
))
av_dict_set
(
&
ist
->
decoder_opts
,
"threads"
,
"auto"
,
0
);
av_dict_set
(
&
ist
->
decoder_opts
,
"threads"
,
"auto"
,
0
);
...
...
fftools/ffmpeg_opt.c
View file @
e9025bea
...
@@ -794,8 +794,8 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
...
@@ -794,8 +794,8 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
if
(
!
ist
->
dec
)
if
(
!
ist
->
dec
)
ist
->
dec
=
avcodec_find_decoder
(
par
->
codec_id
);
ist
->
dec
=
avcodec_find_decoder
(
par
->
codec_id
);
#if FF_API_LOWRES
#if FF_API_LOWRES
if
(
av_codec_get_lowres
(
st
->
codec
)
)
{
if
(
st
->
codec
->
lowres
)
{
av_codec_set_lowres
(
ist
->
dec_ctx
,
av_codec_get_lowres
(
st
->
codec
))
;
ist
->
dec_ctx
->
lowres
=
st
->
codec
->
lowres
;
ist
->
dec_ctx
->
width
=
st
->
codec
->
width
;
ist
->
dec_ctx
->
width
=
st
->
codec
->
width
;
ist
->
dec_ctx
->
height
=
st
->
codec
->
height
;
ist
->
dec_ctx
->
height
=
st
->
codec
->
height
;
ist
->
dec_ctx
->
coded_width
=
st
->
codec
->
coded_width
;
ist
->
dec_ctx
->
coded_width
=
st
->
codec
->
coded_width
;
...
@@ -1663,7 +1663,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
...
@@ -1663,7 +1663,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in
av_log
(
NULL
,
AV_LOG_FATAL
,
"Could not allocate memory for intra matrix.
\n
"
);
av_log
(
NULL
,
AV_LOG_FATAL
,
"Could not allocate memory for intra matrix.
\n
"
);
exit_program
(
1
);
exit_program
(
1
);
}
}
av_codec_set_chroma_intra_matrix
(
video_enc
,
p
)
;
video_enc
->
chroma_intra_matrix
=
p
;
parse_matrix_coeffs
(
p
,
chroma_intra_matrix
);
parse_matrix_coeffs
(
p
,
chroma_intra_matrix
);
}
}
MATCH_PER_STREAM_OPT
(
inter_matrices
,
str
,
inter_matrix
,
oc
,
st
);
MATCH_PER_STREAM_OPT
(
inter_matrices
,
str
,
inter_matrix
,
oc
,
st
);
...
...
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