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
/
libavutil
/
samplefmt.c
diff --git
a/ffmpeg/libavutil/samplefmt.c
b/ffmpeg/libavutil/samplefmt.c
index a1986980f05b8e4cb522a5dec87977225b421781..c605b5ebdf1219e1330a49fcb8b107ca584e0a4f 100644
(file)
--- a/
ffmpeg/libavutil/samplefmt.c
+++ b/
ffmpeg/libavutil/samplefmt.c
@@
-107,14
+107,6
@@
int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt)
0 : sample_fmt_info[sample_fmt].bits >> 3;
}
0 : sample_fmt_info[sample_fmt].bits >> 3;
}
-#if FF_API_GET_BITS_PER_SAMPLE_FMT
-int av_get_bits_per_sample_fmt(enum AVSampleFormat sample_fmt)
-{
- return sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB ?
- 0 : sample_fmt_info[sample_fmt].bits;
-}
-#endif
-
int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt)
{
if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB)
int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt)
{
if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB)
@@
-173,11
+165,7
@@
int av_samples_fill_arrays(uint8_t **audio_data, int *linesize,
if (linesize)
*linesize = line_size;
if (linesize)
*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,
@@
-202,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,