[SCM] libav/experimental: set sample rate in more logical place, kill warning

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:03:18 UTC 2013


The following commit has been merged in the experimental branch:
commit 5ffcb1be1f291b3bc22d71e147eb2b0a33c8dc9c
Author: Måns Rullgård <mans at mansr.com>
Date:   Sun Jul 8 23:15:10 2007 +0000

    set sample rate in more logical place, kill warning
    
    Originally committed as revision 9552 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c
index b41fcf4..4eb2ea2 100644
--- a/libavcodec/mpegaudio_parser.c
+++ b/libavcodec/mpegaudio_parser.c
@@ -146,9 +146,9 @@ static int mpegaudio_parse(AVCodecParserContext *s1,
                         s->frame_size = -1;
                     }
 #endif
-                }
                 if(s->header_count > 1)
                     avctx->sample_rate= sr;
+                }
             }
         } else
 #if 0

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list