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
48bb0da0
Commit
48bb0da0
authored
Mar 16, 2017
by
Vittorio Giovara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: Drop deprecated way of setting audio delay on encode
Deprecated in 08/2014.
parent
5182a28b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
12 deletions
+0
-12
encode.c
libavcodec/encode.c
+0
-4
utils.c
libavcodec/utils.c
+0
-5
version.h
libavcodec/version.h
+0
-3
No files found.
libavcodec/encode.c
View file @
48bb0da0
...
@@ -194,10 +194,6 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
...
@@ -194,10 +194,6 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
end:
end:
av_frame_free
(
&
padded_frame
);
av_frame_free
(
&
padded_frame
);
#if FF_API_AUDIOENC_DELAY
avctx
->
delay
=
avctx
->
initial_padding
;
#endif
return
ret
;
return
ret
;
}
}
...
...
libavcodec/utils.c
View file @
48bb0da0
...
@@ -646,11 +646,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
...
@@ -646,11 +646,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
}
}
}
}
#if FF_API_AUDIOENC_DELAY
if
(
av_codec_is_encoder
(
avctx
->
codec
))
avctx
->
delay
=
avctx
->
initial_padding
;
#endif
if
(
av_codec_is_decoder
(
avctx
->
codec
))
{
if
(
av_codec_is_decoder
(
avctx
->
codec
))
{
/* validate channel layout from the decoder */
/* validate channel layout from the decoder */
if
(
avctx
->
channel_layout
)
{
if
(
avctx
->
channel_layout
)
{
...
...
libavcodec/version.h
View file @
48bb0da0
...
@@ -47,9 +47,6 @@
...
@@ -47,9 +47,6 @@
* the public API and may change, break or disappear at any time.
* the public API and may change, break or disappear at any time.
*/
*/
#ifndef FF_API_AUDIOENC_DELAY
#define FF_API_AUDIOENC_DELAY (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_AVCTX_TIMEBASE
#ifndef FF_API_AVCTX_TIMEBASE
#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 58)
#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#endif
...
...
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