[SCM] FFmpeg packaging branch, master, updated. debian/0.5.1-3-10-gc418284

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1607b50189036f70d450b9981342f484bdc2c4af
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Wed Jun 2 10:03:26 2010 +0200

    Imported Upstream version 0.5.2

diff --git a/Changelog b/Changelog
index d0e1713..64d843d 100644
--- a/Changelog
+++ b/Changelog
@@ -2,10 +2,19 @@ Entries are sorted chronologically from oldest to youngest within each release,
 releases are sorted from youngest to oldest.
 
 
+version 0.5.2:
+
+- Hurd support
+- PowerPC without Altivec compilation issues
+- validate channels and samplerate in the Vorbis decoder
+
+
+
 version 0.5.1:
 
 - build system updates
 - documentation updates
+- libswscale now is LGPL except for x86 optimizations
 - fix for GPL code in libswscale that was erroneously activated
 - AltiVec code in libswscale is now LGPL
 - remaining GPL parts in AC-3 decoder converted to LGPL
diff --git a/RELEASE b/RELEASE
index dd18c45..641d117 100644
--- a/RELEASE
+++ b/RELEASE
@@ -40,7 +40,7 @@ should appear in doc/APIchanges.
 
 
 
-* 0.5.1
+* 0.5.1 March 2, 2010
 
 General notes
 -------------
@@ -101,3 +101,14 @@ claimed. We have changed configure to reflect this. You now have to pass the
 Furthermore the non-free bits in libavcodec/fdctref.c have been rewritten. Note
 well that they were only used in a test program and never compiled into any
 FFmpeg library.
+
+
+
+* 0.5.2 May 25, 2010
+
+General notes
+-------------
+
+This is a maintenance only release that addresses a small number of security
+and portability issues. Distributors and system integrators are encouraged
+to update and share their patches against this branch.
diff --git a/VERSION b/VERSION
index 4b9fcbe..cb0c939 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.1
+0.5.2
diff --git a/configure b/configure
index e96db9e..bf5adc3 100755
--- a/configure
+++ b/configure
@@ -82,7 +82,7 @@ show_help(){
   echo "  --disable-ffplay         disable ffplay build"
   echo "  --disable-ffserver       disable ffserver build"
   echo "  --enable-postproc        enable GPLed postprocessing support [no]"
-  echo "  --enable-swscale         enable GPLed software scaler support [no]"
+  echo "  --enable-swscale         enable software scaler support [no]"
   echo "  --enable-avfilter        video filter support (replaces vhook) [no]"
   echo "  --enable-avfilter-lavf   video filters dependent on avformat [no]"
   echo "  --disable-vhook          disable video hooking support"
@@ -1659,6 +1659,9 @@ case $target_os in
         ;;
     gnu/kfreebsd)
         ;;
+    gnu)
+        disable dv1394
+        ;;
 
     *)
         die "Unknown OS '$target_os'."
diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c
index 6cfdf48..9875657 100644
--- a/libavcodec/vorbis_dec.c
+++ b/libavcodec/vorbis_dec.c
@@ -902,8 +902,16 @@ static int vorbis_parse_id_hdr(vorbis_context *vc){
     }
 
     vc->version=get_bits_long(gb, 32);    //FIXME check 0
-    vc->audio_channels=get_bits(gb, 8);   //FIXME check >0
-    vc->audio_samplerate=get_bits_long(gb, 32);   //FIXME check >0
+    vc->audio_channels=get_bits(gb, 8);
+    if(vc->audio_channels <= 0){
+        av_log(vc->avccontext, AV_LOG_ERROR, "Invalid number of channels\n");
+        return -1;
+    }
+    vc->audio_samplerate=get_bits_long(gb, 32);
+    if(vc->audio_samplerate <= 0){
+        av_log(vc->avccontext, AV_LOG_ERROR, "Invalid samplerate\n");
+        return -1;
+    }
     vc->bitrate_maximum=get_bits_long(gb, 32);
     vc->bitrate_nominal=get_bits_long(gb, 32);
     vc->bitrate_minimum=get_bits_long(gb, 32);
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 0c089c8..dd8f27a 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -960,7 +960,7 @@ static inline void yuv2rgbXinC_full(SwsContext *c, int16_t *lumFilter, int16_t *
 #endif
 
 #if ARCH_PPC
-#if HAVE_ALTIVEC || CONFIG_RUNTIME_CPUDETECT
+#if HAVE_ALTIVEC
 #define COMPILE_ALTIVEC
 #endif
 #endif //ARCH_PPC
@@ -1649,7 +1649,7 @@ static SwsFunc getSwsFunc(int flags){
         return swScale_C;
 
 #else
-#if ARCH_PPC
+#if ARCH_PPC && defined COMPILE_ALTIVEC
     if (flags & SWS_CPU_CAPS_ALTIVEC)
         return swScale_altivec;
     else

-- 
FFmpeg packaging