OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0982b0a
)
lavr: do not try to copy to uninitialized output audio data.
author
Anton Khirnov
<anton@khirnov.net>
Wed, 9 May 2012 04:36:29 +0000
(06:36 +0200)
committer
Anton Khirnov
<anton@khirnov.net>
Wed, 9 May 2012 15:38:23 +0000
(17:38 +0200)
This would happen at least when lavr is used as a fifo with no
conversion.
libavresample/utils.c
patch
|
blob
|
history
diff --git
a/libavresample/utils.c
b/libavresample/utils.c
index
e533760
..
6d4509d
100644
(file)
--- a/
libavresample/utils.c
+++ b/
libavresample/utils.c
@@
-375,7
+375,8
@@
int avresample_convert(AVAudioResampleContext *avr, void **output,
}
}
- return handle_buffered_output(avr, &output_buffer, current_buffer);
+ return handle_buffered_output(avr, output ? &output_buffer : NULL,
+ current_buffer);
}
int avresample_available(AVAudioResampleContext *avr)