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:
7d9e064
)
avcodec/resample: Remove disabled and faulty code
author
Michael Niedermayer
<michael@niedermayer.cc>
Wed, 16 Mar 2016 18:40:32 +0000
(19:40 +0100)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Wed, 16 Mar 2016 18:52:01 +0000
(19:52 +0100)
Fixes Ticket5345
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/resample.c
patch
|
blob
|
history
diff --git
a/libavcodec/resample.c
b/libavcodec/resample.c
index
0f5ee84
..
4c5eb9f
100644
(file)
--- a/
libavcodec/resample.c
+++ b/
libavcodec/resample.c
@@
-291,12
+291,6
@@
int audio_resample(ReSampleContext *s, short *output, short *input, int nb_sampl
short *output_bak = NULL;
int lenout;
- if (s->input_channels == s->output_channels && s->ratio == 1.0 && 0) {
- /* nothing to do */
- memcpy(output, input, nb_samples * s->input_channels * sizeof(short));
- return nb_samples;
- }
-
if (s->sample_fmt[0] != AV_SAMPLE_FMT_S16) {
int istride[1] = { s->sample_size[0] };
int ostride[1] = { 2 };