Packman Build Service PMBS

ffmpeg2theora.changes Added

ffmpeg2theora.spec Changed

lp_509_508_jw.diff Added

@@ -0,0 +1,88 @@
+--- ffmpeg2theora-0.28/src/ffmpeg2theora.c.orig	2011-07-30 22:04:25.000000000 +0200
++++ ffmpeg2theora-0.28/src/ffmpeg2theora.c	2012-03-15 18:17:04.419200000 +0100
+@@ -520,12 +520,12 @@ void ff2theora_output(ff2theora this) {
+     int venc_pix_fmt;
+     AVStream *astream = NULL;
+     AVStream *vstream = NULL;
+     AVCodec *acodec = NULL;
+     AVCodec *vcodec = NULL;
+-    pp_mode_t *ppMode = NULL;
+-    pp_context_t *ppContext = NULL;
++    pp_mode *ppMode = NULL;
++    pp_context *ppContext = NULL;
+     int sws_flags = this->resize_method;
+     float frame_aspect = 0;
+     double fps = 0.0;
+     AVRational vstream_fps;
+     int display_width = -1, display_height = -1;
+@@ -955,15 +955,15 @@ void ff2theora_output(ff2theora this) {
+         }
+ 
+         if (acodec != NULL && avcodec_open (aenc, acodec) >= 0) {
+             if (this->sample_rate != sample_rate
+                 || this->channels != aenc->channels
+-                || aenc->sample_fmt != SAMPLE_FMT_S16) {
++                || aenc->sample_fmt != AV_SAMPLE_FMT_S16) {
+                 // values take from libavcodec/resample.c
+                 this->audio_resample_ctx = av_audio_resample_init(this->channels,    aenc->channels,
+                                                                   this->sample_rate, sample_rate,
+-                                                                  SAMPLE_FMT_S16,    aenc->sample_fmt,
++                                                                  AV_SAMPLE_FMT_S16,    aenc->sample_fmt,
+                                                                   16, 10, 0, 0.8);
+                 if (!this->audio_resample_ctx) {
+                     this->channels = aenc->channels;
+                 }
+                 if (!info.frontend && this->sample_rate!=sample_rate)
+@@ -2831,11 +2831,11 @@ int main(int argc, char **argv) {
+             formatParams->time_base.den = convert->framerate_new.num;
+             formatParams->time_base.num = convert->framerate_new.den;
+         }
+     }
+     if (av_open_input_file(&convert->context, inputfile_name, input_fmt, 0, formatParams) >= 0) {
+-        if (av_find_stream_info(convert->context) >= 0) {
++        if (avformat_find_stream_info(convert->context, NULL) >= 0) {
+ 
+                 if (output_filename_needs_building) {
+                     int i;
+                     /* work out the stream types the output will hold */
+                     int has_video = 0, has_audio = 0, has_kate = 0, has_skeleton = 0;
+@@ -2958,11 +2958,11 @@ int main(int argc, char **argv) {
+                 json_format_info(stdout, NULL, inputfile_name);
+             else
+                 fprintf(stderr,"\nUnable to decode input.\n");
+             return(1);
+         }
+-        av_close_input_file(convert->context);
++        avformat_close_input(&convert->context);
+     }
+     else{
+         if (info.frontend)
+             json_format_info(info.frontend, NULL, inputfile_name);
+         else if (output_json)
+--- ffmpeg2theora-0.28/SConstruct.orig	2011-07-31 12:20:37.000000000 +0200
++++ ffmpeg2theora-0.28/SConstruct	2012-03-15 18:43:13.703216000 +0100
+@@ -140,10 +140,11 @@ FFMPEG_LIBS=
+     "libavdevice",
+     "libavformat",
+     "libavcodec >= 52.30.0",
+     "libpostproc",
+     "libswscale",
++    "libswresample",
+     "libavutil",
+ 
+ if os.path.exists("./ffmpeg"):
+   pkg_path = list(set(map(os.path.dirname, glob('./ffmpeg/*/*.pc'))))
+   pkg_path.append(os.environ.get('PKG_CONFIG_PATH', ''))
+@@ -196,10 +197,12 @@ if conf.CheckCHeader('iconv.h'):
+ if env'crossmingw':
+     env.Append(CCFLAGS='-Wl,-subsystem,windows')
+     env.Append(LIBS='m')
+ elif env'static':
+     env.Append(LIBS='m', 'dl')
++else:
++    env.Append(LIBS='m')
+ 
+ env = conf.Finish()
+ 
+ # ffmpeg2theora 
+ ffmpeg2theora = env.Clone()

Changes of Revision 4