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:
b19e398
)
Remove old workaround in nutdec.c for libnut bug
author
Oded Shimon
<ods15@ods15.dyndns.org>
Mon, 4 Feb 2008 10:30:38 +0000
(10:30 +0000)
committer
Oded Shimon
<ods15@ods15.dyndns.org>
Mon, 4 Feb 2008 10:30:38 +0000
(10:30 +0000)
Originally committed as revision 11853 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/nutdec.c
patch
|
blob
|
history
diff --git
a/libavformat/nutdec.c
b/libavformat/nutdec.c
index
9ecf3d4
..
1519a65
100644
(file)
--- a/
libavformat/nutdec.c
+++ b/
libavformat/nutdec.c
@@
-336,11
+336,7
@@
static int decode_stream_header(NUTContext *nut){
ff_get_v(bc); /* csp type */
}else if (st->codec->codec_type == CODEC_TYPE_AUDIO){
GET_V(st->codec->sample_rate , tmp > 0)
- tmp= ff_get_v(bc); // samplerate_den
- if(tmp > st->codec->sample_rate){
- av_log(s, AV_LOG_ERROR, "Bleh, libnut muxed this ;)\n");
- st->codec->sample_rate= tmp;
- }
+ ff_get_v(bc); // samplerate_den
GET_V(st->codec->channels, tmp > 0)
}
if(skip_reserved(bc, end) || get_checksum(bc)){