git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
381e195
)
pcmdec: remove unnecessary check for sample_fmt change
author
Justin Ruggles
<justin.ruggles@gmail.com>
Tue, 27 Sep 2011 23:47:10 +0000
(19:47 -0400)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Wed, 26 Oct 2011 16:01:06 +0000
(12:01 -0400)
libavcodec/pcm.c
patch
|
blob
|
history
diff --git
a/libavcodec/pcm.c
b/libavcodec/pcm.c
index
158366c
..
c0d0930
100644
(file)
--- a/
libavcodec/pcm.c
+++ b/
libavcodec/pcm.c
@@
-266,11
+266,6
@@
static int pcm_decode_frame(AVCodecContext *avctx,
samples = data;
src = buf;
- if (avctx->sample_fmt!=avctx->codec->sample_fmts[0]) {
- av_log(avctx, AV_LOG_ERROR, "invalid sample_fmt\n");
- return -1;
- }
-
if(avctx->channels <= 0 || avctx->channels > MAX_CHANNELS){
av_log(avctx, AV_LOG_ERROR, "PCM channels out of bounds\n");
return -1;