diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 14:10:26 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 14:10:32 +0100 |
commit | 144529e09493fa5e395eabb8a214e6aec1cfc166 (patch) | |
tree | 45d4c2387666badf60f2a658c7d65c5fdd68c3ca | |
parent | 0a5da9cc148b2ac7102b4a0653c38735672629f6 (diff) | |
parent | d9bf716945046333c24580d538f450b516f15710 (diff) |
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>
-rw-r--r-- | ffmpeg.c | 2 | ||||
-rw-r--r-- | libavcodec/ppc/vorbisdsp_altivec.c | 2 |
2 files changed, 1 insertions, 3 deletions
@@ -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); diff --git a/libavcodec/ppc/vorbisdsp_altivec.c b/libavcodec/ppc/vorbisdsp_altivec.c index f1bcfed173..40434033d5 100644 --- a/libavcodec/ppc/vorbisdsp_altivec.c +++ b/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 |