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
0982b0a4
Commit
0982b0a4
authored
May 09, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavr: make avresample_read() with NULL output discard samples.
parent
b1f9be54
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
avresample.h
libavresample/avresample.h
+2
-1
utils.c
libavresample/utils.c
+2
-0
version.h
libavresample/version.h
+1
-1
No files found.
libavresample/avresample.h
View file @
0982b0a4
...
...
@@ -274,7 +274,8 @@ int avresample_available(AVAudioResampleContext *avr);
* @see avresample_convert()
*
* @param avr audio resample context
* @param output output data pointers
* @param output output data pointers. May be NULL, in which case
* nb_samples of data is discarded from output FIFO.
* @param nb_samples number of samples to read from the FIFO
* @return the number of samples written to output
*/
...
...
libavresample/utils.c
View file @
0982b0a4
...
...
@@ -385,6 +385,8 @@ int avresample_available(AVAudioResampleContext *avr)
int
avresample_read
(
AVAudioResampleContext
*
avr
,
void
**
output
,
int
nb_samples
)
{
if
(
!
output
)
return
av_audio_fifo_drain
(
avr
->
out_fifo
,
nb_samples
);
return
av_audio_fifo_read
(
avr
->
out_fifo
,
output
,
nb_samples
);
}
...
...
libavresample/version.h
View file @
0982b0a4
...
...
@@ -21,7 +21,7 @@
#define LIBAVRESAMPLE_VERSION_MAJOR 0
#define LIBAVRESAMPLE_VERSION_MINOR 0
#define LIBAVRESAMPLE_VERSION_MICRO
1
#define LIBAVRESAMPLE_VERSION_MICRO
2
#define LIBAVRESAMPLE_VERSION_INT AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR, \
LIBAVRESAMPLE_VERSION_MINOR, \
...
...
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