Hello community, here is the log from the commit of package moc for openSUSE:Factory checked in at 2012-05-29 10:34:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/moc (Old) and /work/SRC/openSUSE:Factory/.moc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "moc", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/moc/moc.changes 2012-05-08 12:10:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.moc.new/moc.changes 2012-05-29 10:34:16.000000000 +0200 @@ -1,0 +2,5 @@ +Mon May 28 20:46:11 UTC 2012 - [email protected] + +- Fix build with ffmpeg 0.11 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ moc-2.4.4-new_ffmpeg.c ++++++ --- /var/tmp/diff_new_pack.Ht5wjv/_old 2012-05-29 10:34:17.000000000 +0200 +++ /var/tmp/diff_new_pack.Ht5wjv/_new 2012-05-29 10:34:17.000000000 +0200 @@ -2,7 +2,30 @@ =================================================================== --- decoder_plugins/ffmpeg/ffmpeg.c.orig +++ decoder_plugins/ffmpeg/ffmpeg.c -@@ -81,14 +81,20 @@ static void ffmpeg_info (const char *fil +@@ -42,7 +42,6 @@ + + struct ffmpeg_data + { +- AVFormatParameters ap; + AVFormatContext *ic; + AVCodecContext *enc; + AVCodec *codec; +@@ -65,13 +64,10 @@ static void ffmpeg_info (const char *fil + struct file_tags *info, + const int tags_sel) + { +- AVFormatParameters ap; + AVFormatContext *ic; + int err; + +- memset (&ap, 0, sizeof(ap)); +- +- if ((err = av_open_input_file(&ic, file_name, NULL, 0, &ap)) < 0) { ++ if ((err = av_open_input_file(&ic, file_name, NULL, 0, NULL)) < 0) { + logit ("av_open_input_file() failed (%d)", err); + return; + } +@@ -81,14 +77,20 @@ static void ffmpeg_info (const char *fil } if (tags_sel & TAGS_COMMENTS) { @@ -31,7 +54,18 @@ } if (tags_sel & TAGS_TIME) -@@ -127,7 +133,7 @@ static void *ffmpeg_open (const char *fi +@@ -107,9 +109,8 @@ static void *ffmpeg_open (const char *fi + data->ok = 0; + + decoder_error_init (&data->error); +- memset (&data->ap, 0, sizeof(data->ap)); + +- err = av_open_input_file (&data->ic, file, NULL, 0, &data->ap); ++ err = av_open_input_file (&data->ic, file, NULL, 0, NULL); + if (err < 0) { + decoder_error (&data->error, ERROR_FATAL, 0, "Can't open file"); + return data; +@@ -127,7 +128,7 @@ static void *ffmpeg_open (const char *fi av_read_play (data->ic); for (i = 0; i < data->ic->nb_streams; i++) { data->enc = data->ic->streams[i]->codec; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
