From 9ec8971060a00f249f387a2baef949ec59de26a7 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Thu, 31 Jan 2013 21:07:34 +0100
Subject: [PATCH 1/3] bink demuxer: set framerate.

---
 libavformat/bink.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/bink.c b/libavformat/bink.c
index 62c377dfff..f093e7c3e2 100644
--- a/libavformat/bink.c
+++ b/libavformat/bink.c
@@ -112,6 +112,7 @@ static int read_header(AVFormatContext *s)
         return AVERROR(EIO);
     }
     avpriv_set_pts_info(vst, 64, fps_den, fps_num);
+    vst->avg_frame_rate = av_inv_q(vst->time_base);
 
     vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
     vst->codec->codec_id   = AV_CODEC_ID_BINKVIDEO;

From 4eef2ed707444fd1fac2bd25cefae912a179762f Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Fri, 1 Feb 2013 01:54:19 +0100
Subject: [PATCH 2/3] ppc: fmtconvert: Drop two unused variables.

---
 libavcodec/ppc/fmtconvert_altivec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/ppc/fmtconvert_altivec.c b/libavcodec/ppc/fmtconvert_altivec.c
index 68e5e0079e..694e9306f0 100644
--- a/libavcodec/ppc/fmtconvert_altivec.c
+++ b/libavcodec/ppc/fmtconvert_altivec.c
@@ -92,8 +92,8 @@ static void float_to_int16_altivec(int16_t *dst, const float *src, long len)
 static void float_to_int16_stride_altivec(int16_t *dst, const float *src,
                                           long len, int stride)
 {
-    int i, j;
-    vector signed short d, s;
+    int i;
+    vector signed short d;
 
     for (i = 0; i < len - 7; i += 8) {
         d = float_to_int16_one_altivec(src + i);

From 6c1a7d07eb41b4cf36e48ebb560fecd9504fd968 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Fri, 1 Feb 2013 10:27:45 +0100
Subject: [PATCH 3/3] Use proper "" quotes for local header #includes

---
 libavcodec/arm/videodsp_init_armv5te.c | 2 +-
 libavcodec/kbdwin.c                    | 2 +-
 libavformat/rtp.c                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/arm/videodsp_init_armv5te.c b/libavcodec/arm/videodsp_init_armv5te.c
index a7b8b23119..5830f4b8cc 100644
--- a/libavcodec/arm/videodsp_init_armv5te.c
+++ b/libavcodec/arm/videodsp_init_armv5te.c
@@ -19,7 +19,7 @@
  */
 
 #include "libavutil/arm/cpu.h"
-#include <libavcodec/videodsp.h>
+#include "libavcodec/videodsp.h"
 #include "videodsp_arm.h"
 
 void ff_prefetch_arm(uint8_t *mem, ptrdiff_t stride, int h);
diff --git a/libavcodec/kbdwin.c b/libavcodec/kbdwin.c
index 3b590b38ef..1b7313d1dc 100644
--- a/libavcodec/kbdwin.c
+++ b/libavcodec/kbdwin.c
@@ -17,7 +17,7 @@
  */
 
 #include <assert.h>
-#include <libavutil/mathematics.h>
+#include "libavutil/mathematics.h"
 #include "libavutil/attributes.h"
 #include "kbdwin.h"
 
diff --git a/libavformat/rtp.c b/libavformat/rtp.c
index e827c2e0ab..0a3c411f51 100644
--- a/libavformat/rtp.c
+++ b/libavformat/rtp.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <libavutil/opt.h>
+#include "libavutil/opt.h"
 #include "avformat.h"
 
 #include "rtp.h"