[Ffmpeg-cvslog] r6966 - in trunk/libavformat: Makefile allformats.c nut.h nutdec.c

[Oded Shimon]

On Sat, Nov 11, 2006 at 02:35:51AM +0100, michael wrote:
> samplerate is stored wrong by libnut (demuxer has a workaround)

> +    }else if (st->codec->codec_type == CODEC_TYPE_AUDIO){
> +        GET_V(st->codec->sample_rate , tmp > 0)
> +        tmp= 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;
> +        }

Can I remove this now? :)

- ods15
-------------- next part --------------
Index: libavformat/nutdec.c
===================================================================
--- libavformat/nutdec.c	(revision 7012)
+++ libavformat/nutdec.c	(working copy)
@@ -358,11 +358,7 @@
         get_v(bc); /* csp type */
     }else if (st->codec->codec_type == CODEC_TYPE_AUDIO){
         GET_V(st->codec->sample_rate , tmp > 0)
-        tmp= 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;
-        }
+        get_v(bc); // samplerate_den
         GET_V(st->codec->channels, tmp > 0)
     }
     if(skip_reserved(bc, end) || get_checksum(bc)){