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
3e575209
Commit
3e575209
authored
Sep 15, 2014
by
James Almer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avutil: remove obsolete FF_API_SAMPLES_UTILS_RETURN_ZERO cruft
Signed-off-by:
James Almer
<
jamrial@gmail.com
>
parent
71718de8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
11 deletions
+0
-11
samplefmt.c
libavutil/samplefmt.c
+0
-8
version.h
libavutil/version.h
+0
-3
No files found.
libavutil/samplefmt.c
View file @
3e575209
...
@@ -165,11 +165,7 @@ int av_samples_fill_arrays(uint8_t **audio_data, int *linesize,
...
@@ -165,11 +165,7 @@ int av_samples_fill_arrays(uint8_t **audio_data, int *linesize,
if
(
linesize
)
if
(
linesize
)
*
linesize
=
line_size
;
*
linesize
=
line_size
;
#if FF_API_SAMPLES_UTILS_RETURN_ZERO
return
0
;
#else
return
buf_size
;
return
buf_size
;
#endif
}
}
int
av_samples_alloc
(
uint8_t
**
audio_data
,
int
*
linesize
,
int
nb_channels
,
int
av_samples_alloc
(
uint8_t
**
audio_data
,
int
*
linesize
,
int
nb_channels
,
...
@@ -194,11 +190,7 @@ int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels,
...
@@ -194,11 +190,7 @@ int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels,
av_samples_set_silence
(
audio_data
,
0
,
nb_samples
,
nb_channels
,
sample_fmt
);
av_samples_set_silence
(
audio_data
,
0
,
nb_samples
,
nb_channels
,
sample_fmt
);
#if FF_API_SAMPLES_UTILS_RETURN_ZERO
return
0
;
#else
return
size
;
return
size
;
#endif
}
}
int
av_samples_alloc_array_and_samples
(
uint8_t
***
audio_data
,
int
*
linesize
,
int
nb_channels
,
int
av_samples_alloc_array_and_samples
(
uint8_t
***
audio_data
,
int
*
linesize
,
int
nb_channels
,
...
...
libavutil/version.h
View file @
3e575209
...
@@ -101,9 +101,6 @@
...
@@ -101,9 +101,6 @@
#ifndef FF_API_CPU_FLAG_MMX2
#ifndef FF_API_CPU_FLAG_MMX2
#define FF_API_CPU_FLAG_MMX2 (LIBAVUTIL_VERSION_MAJOR < 55)
#define FF_API_CPU_FLAG_MMX2 (LIBAVUTIL_VERSION_MAJOR < 55)
#endif
#endif
#ifndef FF_API_SAMPLES_UTILS_RETURN_ZERO
#define FF_API_SAMPLES_UTILS_RETURN_ZERO (LIBAVUTIL_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_LLS_PRIVATE
#ifndef FF_API_LLS_PRIVATE
#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 55)
#define FF_API_LLS_PRIVATE (LIBAVUTIL_VERSION_MAJOR < 55)
#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