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
62dfea65
Commit
62dfea65
authored
Jan 22, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: remove disabled FF_API_OLD_AUDIOCONVERT cruft.
parent
284e65d6
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
88 deletions
+0
-88
audioconvert.c
libavcodec/audioconvert.c
+0
-17
audioconvert.h
libavcodec/audioconvert.h
+0
-20
avcodec.h
libavcodec/avcodec.h
+0
-48
version.h
libavcodec/version.h
+0
-3
No files found.
libavcodec/audioconvert.c
View file @
62dfea65
...
@@ -45,23 +45,6 @@ uint64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, co
...
@@ -45,23 +45,6 @@ uint64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, co
}
}
}
}
#if FF_API_OLD_AUDIOCONVERT
int64_t
avcodec_get_channel_layout
(
const
char
*
name
)
{
return
av_get_channel_layout
(
name
);
}
void
avcodec_get_channel_layout_string
(
char
*
buf
,
int
buf_size
,
int
nb_channels
,
int64_t
channel_layout
)
{
av_get_channel_layout_string
(
buf
,
buf_size
,
nb_channels
,
channel_layout
);
}
int
avcodec_channel_layout_num_channels
(
int64_t
channel_layout
)
{
return
av_get_channel_layout_nb_channels
(
channel_layout
);
}
#endif
struct
AVAudioConvert
{
struct
AVAudioConvert
{
int
in_channels
,
out_channels
;
int
in_channels
,
out_channels
;
int
fmt_pair
;
int
fmt_pair
;
...
...
libavcodec/audioconvert.h
View file @
62dfea65
...
@@ -33,26 +33,6 @@
...
@@ -33,26 +33,6 @@
#include "avcodec.h"
#include "avcodec.h"
#include "libavutil/audioconvert.h"
#include "libavutil/audioconvert.h"
#if FF_API_OLD_AUDIOCONVERT
/**
* @deprecated Use av_get_channel_layout() instead.
*/
attribute_deprecated
int64_t
avcodec_get_channel_layout
(
const
char
*
name
);
/**
* @deprecated Use av_get_channel_layout_string() instead.
*/
attribute_deprecated
void
avcodec_get_channel_layout_string
(
char
*
buf
,
int
buf_size
,
int
nb_channels
,
int64_t
channel_layout
);
/**
* @deprecated Use av_get_channel_layout_nb_channels() instead.
*/
attribute_deprecated
int
avcodec_channel_layout_num_channels
(
int64_t
channel_layout
);
#endif
/**
/**
* Guess the channel layout
* Guess the channel layout
* @param nb_channels
* @param nb_channels
...
...
libavcodec/avcodec.h
View file @
62dfea65
...
@@ -424,54 +424,6 @@ enum CodecID {
...
@@ -424,54 +424,6 @@ enum CodecID {
CODEC_ID_FFMETADATA
=
0x21000
,
///< Dummy codec for streams containing only metadata information.
CODEC_ID_FFMETADATA
=
0x21000
,
///< Dummy codec for streams containing only metadata information.
};
};
#if FF_API_OLD_AUDIOCONVERT
#include "libavutil/audioconvert.h"
/* Audio channel masks */
#define CH_FRONT_LEFT AV_CH_FRONT_LEFT
#define CH_FRONT_RIGHT AV_CH_FRONT_RIGHT
#define CH_FRONT_CENTER AV_CH_FRONT_CENTER
#define CH_LOW_FREQUENCY AV_CH_LOW_FREQUENCY
#define CH_BACK_LEFT AV_CH_BACK_LEFT
#define CH_BACK_RIGHT AV_CH_BACK_RIGHT
#define CH_FRONT_LEFT_OF_CENTER AV_CH_FRONT_LEFT_OF_CENTER
#define CH_FRONT_RIGHT_OF_CENTER AV_CH_FRONT_RIGHT_OF_CENTER
#define CH_BACK_CENTER AV_CH_BACK_CENTER
#define CH_SIDE_LEFT AV_CH_SIDE_LEFT
#define CH_SIDE_RIGHT AV_CH_SIDE_RIGHT
#define CH_TOP_CENTER AV_CH_TOP_CENTER
#define CH_TOP_FRONT_LEFT AV_CH_TOP_FRONT_LEFT
#define CH_TOP_FRONT_CENTER AV_CH_TOP_FRONT_CENTER
#define CH_TOP_FRONT_RIGHT AV_CH_TOP_FRONT_RIGHT
#define CH_TOP_BACK_LEFT AV_CH_TOP_BACK_LEFT
#define CH_TOP_BACK_CENTER AV_CH_TOP_BACK_CENTER
#define CH_TOP_BACK_RIGHT AV_CH_TOP_BACK_RIGHT
#define CH_STEREO_LEFT AV_CH_STEREO_LEFT
#define CH_STEREO_RIGHT AV_CH_STEREO_RIGHT
/** Channel mask value used for AVCodecContext.request_channel_layout
to indicate that the user requests the channel order of the decoder output
to be the native codec channel order. */
#define CH_LAYOUT_NATIVE AV_CH_LAYOUT_NATIVE
/* Audio channel convenience macros */
#define CH_LAYOUT_MONO AV_CH_LAYOUT_MONO
#define CH_LAYOUT_STEREO AV_CH_LAYOUT_STEREO
#define CH_LAYOUT_2_1 AV_CH_LAYOUT_2_1
#define CH_LAYOUT_SURROUND AV_CH_LAYOUT_SURROUND
#define CH_LAYOUT_4POINT0 AV_CH_LAYOUT_4POINT0
#define CH_LAYOUT_2_2 AV_CH_LAYOUT_2_2
#define CH_LAYOUT_QUAD AV_CH_LAYOUT_QUAD
#define CH_LAYOUT_5POINT0 AV_CH_LAYOUT_5POINT0
#define CH_LAYOUT_5POINT1 AV_CH_LAYOUT_5POINT1
#define CH_LAYOUT_5POINT0_BACK AV_CH_LAYOUT_5POINT0_BACK
#define CH_LAYOUT_5POINT1_BACK AV_CH_LAYOUT_5POINT1_BACK
#define CH_LAYOUT_7POINT0 AV_CH_LAYOUT_7POINT0
#define CH_LAYOUT_7POINT1 AV_CH_LAYOUT_7POINT1
#define CH_LAYOUT_7POINT1_WIDE AV_CH_LAYOUT_7POINT1_WIDE
#define CH_LAYOUT_STEREO_DOWNMIX AV_CH_LAYOUT_STEREO_DOWNMIX
#endif
#if FF_API_OLD_DECODE_AUDIO
#if FF_API_OLD_DECODE_AUDIO
/* in bytes */
/* in bytes */
#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
...
...
libavcodec/version.h
View file @
62dfea65
...
@@ -38,9 +38,6 @@
...
@@ -38,9 +38,6 @@
* Those FF_API_* defines are not part of public API.
* Those FF_API_* defines are not part of public API.
* They may change, break or disappear at any time.
* They may change, break or disappear at any time.
*/
*/
#ifndef FF_API_OLD_AUDIOCONVERT
#define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_ANTIALIAS_ALGO
#ifndef FF_API_ANTIALIAS_ALGO
#define FF_API_ANTIALIAS_ALGO (LIBAVCODEC_VERSION_MAJOR < 54)
#define FF_API_ANTIALIAS_ALGO (LIBAVCODEC_VERSION_MAJOR < 54)
#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