File ffmpeg2theora-ffmpeg-2.0.patch of Package ffmpeg2theora

File ffmpeg2theora-ffmpeg-2.0.patch of Package ffmpeg2theora (Revision 7)

Currently displaying revision 7 , Show latest

Index: ffmpeg2theora-0.29/src/ffmpeg2theora.c
===================================================================
--- ffmpeg2theora-0.29.orig/src/ffmpeg2theora.c
+++ ffmpeg2theora-0.29/src/ffmpeg2theora.c
@@ -24,18 +24,19 @@
 #include <getopt.h>
 #include <math.h>
 #include <errno.h>
+#include <ctype.h>
 
-#include "libavformat/avformat.h"
-#include "libavdevice/avdevice.h"
+#include <libavformat/avformat.h>
+#include <libavdevice/avdevice.h>
 #ifdef HAVE_FRAMEHOOK
-#include "libavformat/framehook.h"
+#include <libavformat/framehook.h>
 #endif
-#include "libswscale/swscale.h"
-#include "libpostproc/postprocess.h"
+#include <libswscale/swscale.h>
+#include <libpostproc/postprocess.h>
 
-#include "theora/theoraenc.h"
-#include "vorbis/codec.h"
-#include "vorbis/vorbisenc.h"
+#include <theora/theoraenc.h>
+#include <vorbis/codec.h>
+#include <vorbis/vorbisenc.h>
 
 #ifdef WIN32
 #include "fcntl.h"
@@ -48,6 +49,7 @@
 #include "avinfo.h"
 
 #define LENGTH(x) (sizeof(x) / sizeof(*x))
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 19200 // 1 second of 48khz 32bit audio
 
 enum {
     NULL_FLAG,
@@ -1424,7 +1426,7 @@ void ff2theora_output(ff2theora this) {
 
                             if (venc_pix_fmt != this->pix_fmt) {
                                 sws_scale(this->sws_colorspace_ctx,
-                                frame->data, frame->linesize, 0, display_height,
+                                (const uint8_t * const*)frame->data, frame->linesize, 0, display_height,
                                 output_tmp->data, output_tmp->linesize);
                             }
                             else{
@@ -1468,7 +1470,7 @@ void ff2theora_output(ff2theora this) {
                             }
                             if (this->sws_scale_ctx) {
                                 sws_scale(this->sws_scale_ctx,
-                                    output_cropped->data,
+                                    (const uint8_t * const*)output_cropped->data,
                                     output_cropped->linesize, 0,
                                     display_height - (this->frame_topBand + this->frame_bottomBand),
                                     output_resized->data,