Merge commit 'd9bf716945046333c24580d538f450b516f15710'

* commit 'd9bf716945046333c24580d538f450b516f15710':
  ppc: vorbisdsp: Drop some unnecessary #includes
  avconv: Increase the SDP buffer size to fit xiph SDPs

Merged-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg.c

@@ -1870,7 +1870,7 @@ static int output_packet(InputStream *ist, const AVPacket *pkt)
 
 static void print_sdp(void)
 {
-    char sdp[2048];
+    char sdp[16384];
     int i;
     AVFormatContext **avc = av_malloc(sizeof(*avc) * nb_output_files);
 

libavcodec/ppc/vorbisdsp_altivec.c

@@ -23,8 +23,6 @@
 #include <altivec.h>
 #endif
 #include "libavutil/cpu.h"
-#include "libavutil/ppc/types_altivec.h"
-#include "libavutil/ppc/util_altivec.h"
 #include "libavcodec/vorbisdsp.h"
 
 #if HAVE_ALTIVEC