[SCM] libquicktime/master: Refresh

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 81e99d4290f51f424c1070cdfd7d9f7142f5e588
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jul 9 10:34:02 2011 +0200

    Refresh

diff --git a/debian/patches/30-libav-0.7.patch b/debian/patches/30-libav-0.7.patch
index c956a4f..5ab98ec 100644
--- a/debian/patches/30-libav-0.7.patch
+++ b/debian/patches/30-libav-0.7.patch
@@ -5,9 +5,13 @@ Forwarded: no
 libquicktime still uses deprecated API that have been removed in Libav
 0.7/FFmpeg 0.8.
 
---- a/plugins/ffmpeg/lqt_ffmpeg.c
-+++ b/plugins/ffmpeg/lqt_ffmpeg.c
-@@ -1031,8 +1031,8 @@ static void set_codec_info(struct CODECI
+---
+ plugins/ffmpeg/lqt_ffmpeg.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- libquicktime.orig/plugins/ffmpeg/lqt_ffmpeg.c
++++ libquicktime/plugins/ffmpeg/lqt_ffmpeg.c
+@@ -1044,8 +1044,8 @@ static void set_codec_info(struct CODECI
    snprintf(ffmpeg_long_name, 256, "%s", map->name);
    snprintf(ffmpeg_description, 256, "%s", map->name);
    
@@ -18,14 +22,3 @@ libquicktime still uses deprecated API that have been removed in Libav
         codec_info_ffmpeg.type = LQT_CODEC_VIDEO;
    } else {
         codec_info_ffmpeg.type = LQT_CODEC_AUDIO;
---- a/plugins/ffmpeg/params.c
-+++ b/plugins/ffmpeg/params.c
-@@ -205,8 +205,6 @@ void lqt_ffmpeg_set_parameter(AVCodecCon
-   PARAM_FLOAT("ff_p_masking",p_masking);
-   PARAM_FLOAT("ff_dark_masking",dark_masking);
-   PARAM_ENUM("ff_prediction_method",prediction_method,prediction_method);
--  PARAM_INT("ff_mb_qmin",mb_qmin);
--  PARAM_INT("ff_mb_qmax",mb_qmax);
-   PARAM_ENUM("ff_me_cmp",me_cmp,compare_func);
-   PARAM_CMP_CHROMA("ff_me_cmp_chroma",me_cmp);
-   PARAM_ENUM("ff_me_sub_cmp",me_sub_cmp,compare_func);

-- 
libquicktime packaging