justinruggles

From 03f42e9e885ce8e5f29e3f04e2c98e5352f69df4 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rsbultje@gmail.com>
Date: Mon, 30 Jul 2012 13:00:04 -0700
Subject: [PATCH] fft: port FFT and IMDCT functions for 3dnow to yasm.

---
 libavcodec/x86/Makefile    |    2 -
 libavcodec/x86/fft_3dn.c   |   23 ------
 libavcodec/x86/fft_3dn2.c  |  173 --------------------------------------------
 libavcodec/x86/fft_mmx.asm |  169 +++++++++++++++++++++++++++++++++++++++----

justinruggles

%if 1
                                    ; shuffle dwords:
    pshufd        m3, m3, q3120     ; m3 =  0,  1,  2,  3, 12, 13, 14, 15
    pshufd        m0, m0, q1302     ; m0 =  4,  5,  6,  7, 16, 17, 18, 19
    pshufd        m2, m2, q3120     ; m2 =  8,  9, 10, 11, 20, 21, 22, 23
    movq   [dstq   ], m3
    movq   [dstq+ 8], m0
    movq   [dstq+16], m2
    movhps [dstq+24], m3
    movhps [dstq+32], m0

justinruggles

works:
    palignr    m1, m0, m3, 12

works:
    mova       m1, m3
    mova       m4, m0
    pslldq     m1, 4
    psrldq     m4, 12
    por        m1, m4

justinruggles

diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index 94e381d..3dcafb1 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -52,6 +52,7 @@ typedef struct CompressionOptions {
     int prediction_order_method;
     int min_partition_order;
     int max_partition_order;
+    int bits_per_sample;
 } CompressionOptions;

justinruggles

aac                     fltp, s16               [done]
aac_latm                fltp, s16               [done]
ac3                     fltp, s16               [done]
adpcm_4xm               s16p
adpcm_adx               s16p
adpcm_ct                s16                     [existing] natively interleaved
adpcm_ea                s16                     [existing] natively interleaved
adpcm_ea_maxis_xa       s16                     [existing] natively interleaved
adpcm_ea_r1             s16p
adpcm_ea_r2             s16p

justinruggles

From 8965967b510ce7a6f86abbc4e3b9a16f7f02ff49 Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Fri, 31 Aug 2012 22:57:12 -0400
Subject: [PATCH 6/6] lavfi: increase MAX_REGISTERED_AVFILTERS_NB to 128

---
 libavfilter/avfilter.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c

justinruggles

diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c
index eb2d2f9..7547b9c 100644
--- a/libavfilter/af_resample.c
+++ b/libavfilter/af_resample.c
@@ -93,7 +93,11 @@ static int config_output(AVFilterLink *outlink)
 
     if (inlink->channel_layout == outlink->channel_layout &&
         inlink->sample_rate    == outlink->sample_rate    &&
-        inlink->format         == outlink->format)
+        (inlink->format        == outlink->format ||

justinruggles

aac                     fltp, s16               [done]
aac_latm                fltp, s16               [done]
ac3                     fltp, s16               [done]
adpcm_4xm               s16p                    [done]
adpcm_adx               s16p                    [done]
adpcm_ct                s16                     [existing] natively interleaved
adpcm_ea                s16                     [existing] natively interleaved
adpcm_ea_maxis_xa       s16                     [existing] natively interleaved
adpcm_ea_r1             s16p                    [done]
adpcm_ea_r2             s16p                    [done]

justinruggles

diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c
index eb2d2f9..58b3837 100644
--- a/libavfilter/af_resample.c
+++ b/libavfilter/af_resample.c
@@ -209,7 +209,8 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *buf)
 
         if (ret > 0) {
             buf_out->audio->nb_samples = ret;
-            if (buf->pts != AV_NOPTS_VALUE) {
+            if (inlink->sample_rate == outlink->sample_rate &&

justinruggles

====================
ALREADY IN MASTER
====================

--------------------------------------------------------------------------------
CVE-2012-2772
cb7190cd2c691fd93e4d3664f3fce6c19ee001dd
master - CommitDate: Fri Mar 23 23:11:55 2012 +0100
--------------------------------------------------------------------------------