diff options
| author | Oded Shimon <ods15@ods15.dyndns.org> | 2008-02-04 10:30:38 +0000 |
|---|---|---|
| committer | Oded Shimon <ods15@ods15.dyndns.org> | 2008-02-04 10:30:38 +0000 |
| commit | eae213af43a3db24720d6df6b543224b7dce1fd3 (patch) | |
| tree | f36dc0a7812534ec7933773498dcf268eef0e996 /libavformat/nutdec.c | |
| parent | b19e3983cfb157751301aec87237ea28676665f0 (diff) | |
| download | ffmpeg-eae213af43a3db24720d6df6b543224b7dce1fd3.tar.gz | |
Remove old workaround in nutdec.c for libnut bug
Originally committed as revision 11853 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/nutdec.c')
| -rw-r--r-- | libavformat/nutdec.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 9ecf3d4a97..1519a652c3 100644 --- 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)){ |