repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavresample
/
utils.c
diff --git
a/ffmpeg/libavresample/utils.c
b/ffmpeg/libavresample/utils.c
index 69c255b4508465bff9506f7bfc3be081e483ac5e..e285445d2f8365718e0e6a0faf03c4fb8271c3b6 100644
(file)
--- a/
ffmpeg/libavresample/utils.c
+++ b/
ffmpeg/libavresample/utils.c
@@
-585,9
+585,12
@@
static inline int convert_frame(AVAudioResampleContext *avr,
static inline int available_samples(AVFrame *out)
{
static inline int available_samples(AVFrame *out)
{
+ int samples;
int bytes_per_sample = av_get_bytes_per_sample(out->format);
int bytes_per_sample = av_get_bytes_per_sample(out->format);
- int samples = out->linesize[0] / bytes_per_sample;
+ if (!bytes_per_sample)
+ return AVERROR(EINVAL);
+ samples = out->linesize[0] / bytes_per_sample;
if (av_sample_fmt_is_planar(out->format)) {
return samples;
} else {
if (av_sample_fmt_is_planar(out->format)) {
return samples;
} else {