[FFmpeg-soc] [soc]: r5778 - in libavfilter: checkout.sh diffs/02_ffmpeg_filters.diff diffs/03_libavfilter_doc.diff
stefano
subversion at mplayerhq.hu
Sat May 1 20:23:07 CEST 2010
Author: stefano
Date: Sat May 1 20:23:07 2010
New Revision: 5778
Log:
Update to FFmpeg r23004 / libswscale r31050.
Modified:
libavfilter/checkout.sh
libavfilter/diffs/02_ffmpeg_filters.diff
libavfilter/diffs/03_libavfilter_doc.diff
Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh Mon Apr 26 18:24:08 2010 (r5777)
+++ libavfilter/checkout.sh Sat May 1 20:23:07 2010 (r5778)
@@ -1,11 +1,11 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r22866
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r23004
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
-svn up -r30979
+svn up -r31050
cd ../..
echo "patching ffmpeg"
Modified: libavfilter/diffs/02_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/02_ffmpeg_filters.diff Mon Apr 26 18:24:08 2010 (r5777)
+++ libavfilter/diffs/02_ffmpeg_filters.diff Sat May 1 20:23:07 2010 (r5778)
@@ -1,6 +1,6 @@
Index: ffmpeg.c
===================================================================
---- ffmpeg.c (revision 22866)
+--- ffmpeg.c (revision 23004)
+++ ffmpeg.c (working copy)
@@ -43,6 +43,13 @@
#include "libavutil/libm.h"
@@ -237,7 +237,7 @@ Index: ffmpeg.c
if (received_sigterm) {
fprintf(stderr,
"Received signal %d: terminating.\n",
-@@ -932,7 +1132,9 @@
+@@ -952,7 +1152,9 @@
int *frame_size)
{
int nb_frames, i, ret;
@@ -247,7 +247,7 @@ Index: ffmpeg.c
AVFrame *final_picture, *formatted_picture, *resampling_dst, *padding_src;
AVFrame picture_crop_temp, picture_pad_temp;
AVCodecContext *enc, *dec;
-@@ -980,6 +1182,9 @@
+@@ -1000,6 +1202,9 @@
if (nb_frames <= 0)
return;
@@ -257,7 +257,7 @@ Index: ffmpeg.c
if (ost->video_crop) {
if (av_picture_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) {
fprintf(stderr, "error cropping picture\n");
-@@ -991,6 +1196,7 @@
+@@ -1011,6 +1216,7 @@
} else {
formatted_picture = in_picture;
}
@@ -265,7 +265,7 @@ Index: ffmpeg.c
final_picture = formatted_picture;
padding_src = formatted_picture;
-@@ -1017,6 +1223,7 @@
+@@ -1037,6 +1243,7 @@
av_exit(1);
}
@@ -273,7 +273,7 @@ Index: ffmpeg.c
if (ost->video_resample) {
padding_src = NULL;
final_picture = &ost->pict_tmp;
-@@ -1064,6 +1271,7 @@
+@@ -1084,6 +1291,7 @@
sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize,
0, ost->resample_height, resampling_dst->data, resampling_dst->linesize);
}
@@ -281,7 +281,7 @@ Index: ffmpeg.c
if (ost->video_pad) {
av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
-@@ -1329,6 +1537,10 @@
+@@ -1349,6 +1557,10 @@
static unsigned int samples_size= 0;
AVSubtitle subtitle, *subtitle_to_free;
int got_subtitle;
@@ -292,7 +292,7 @@ Index: ffmpeg.c
AVPacket avpkt;
int bps = av_get_bits_per_sample_format(ist->st->codec->sample_fmt)>>3;
-@@ -1456,6 +1668,15 @@
+@@ -1476,6 +1688,15 @@
&buffer_to_free);
}
@@ -308,7 +308,7 @@ Index: ffmpeg.c
// preprocess audio (volume)
if (ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
if (audio_volume != 256) {
-@@ -1477,10 +1698,18 @@
+@@ -1497,10 +1718,18 @@
if (pts > now)
usleep(pts - now);
}
@@ -328,7 +328,7 @@ Index: ffmpeg.c
for(i=0;i<nb_ostreams;i++) {
int frame_size;
-@@ -1498,6 +1727,9 @@
+@@ -1518,6 +1747,9 @@
do_audio_out(os, ost, ist, decoded_data_buf, decoded_data_size);
break;
case AVMEDIA_TYPE_VIDEO:
@@ -338,7 +338,7 @@ Index: ffmpeg.c
do_video_out(os, ost, ist, &picture, &frame_size);
if (vstats_filename && frame_size)
do_video_stats(os, ost, frame_size);
-@@ -1566,7 +1798,17 @@
+@@ -1586,7 +1818,17 @@
av_free_packet(&opkt);
}
}
@@ -356,7 +356,7 @@ Index: ffmpeg.c
av_free(buffer_to_free);
/* XXX: allocate the subtitles in the codec ? */
if (subtitle_to_free) {
-@@ -2044,9 +2286,10 @@
+@@ -2064,9 +2306,10 @@
av_exit(1);
}
@@ -368,7 +368,7 @@ Index: ffmpeg.c
codec->bits_per_raw_sample= 0;
}
ost->resample_height = icodec->height - (frame_topBand + frame_bottomBand);
-@@ -2054,6 +2297,13 @@
+@@ -2074,6 +2317,13 @@
ost->resample_pix_fmt= icodec->pix_fmt;
ost->encoding_needed = 1;
ist->decoding_needed = 1;
@@ -382,7 +382,7 @@ Index: ffmpeg.c
break;
case AVMEDIA_TYPE_SUBTITLE:
ost->encoding_needed = 1;
-@@ -2439,6 +2689,12 @@
+@@ -2459,6 +2709,12 @@
avcodec_close(ist->st->codec);
}
}
@@ -395,7 +395,7 @@ Index: ffmpeg.c
/* finished ! */
ret = 0;
-@@ -4015,6 +4271,9 @@
+@@ -4040,6 +4296,9 @@
{ "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" },
{ "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" },
{ "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" },
@@ -405,10 +405,10 @@ Index: ffmpeg.c
{ "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" },
{ "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" },
{ "top", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_top_field_first}, "top=1/bottom=0/auto=-1 field first", "" },
-@@ -4075,6 +4334,9 @@
-
- avcodec_register_all();
+@@ -4102,6 +4361,9 @@
+ #if CONFIG_AVDEVICE
avdevice_register_all();
+ #endif
+#if CONFIG_AVFILTER
+ avfilter_register_all();
+#endif
Modified: libavfilter/diffs/03_libavfilter_doc.diff
==============================================================================
--- libavfilter/diffs/03_libavfilter_doc.diff Mon Apr 26 18:24:08 2010 (r5777)
+++ libavfilter/diffs/03_libavfilter_doc.diff Sat May 1 20:23:07 2010 (r5778)
@@ -1,10 +1,10 @@
Index: doc/libavfilter.texi
===================================================================
---- doc/libavfilter.texi (revision 22866)
+--- doc/libavfilter.texi (revision 23004)
+++ doc/libavfilter.texi (working copy)
@@ -139,6 +139,20 @@
- The default value of ``width'' and ``height'' is 0.
+ The default value of @var{width} and @var{height} is 0.
+ at section drawbox
+
@@ -152,10 +152,10 @@ Index: doc/libavfilter.texi
+
@section scale
- Scale the input video to width:height and/or convert the image format.
+ Scale the input video to @var{width}:@var{height} and/or convert the image format.
@@ -202,6 +332,24 @@
- The default value of ``width'' and ``height'' is 0.
+ The default value of @var{width} and @var{height} is 0.
+ at section setpts
+
More information about the FFmpeg-soc
mailing list