virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

Merge commit 'd9bf716945046333c24580d538f450b516f15710'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-01-21 14:10:26 +01:00
commit 144529e094
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg.c
View File

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

2
libavcodec/ppc/vorbisdsp_altivec.c
View File

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