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>
2013-01-21 14:10:26 +01:00
parent 0a5da9cc14 d9bf716945
commit 144529e094
2 changed files with 1 additions and 3 deletions
--- a/ffmpeg.c
+++ b/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);