[FFmpeg-soc] [soc]: r5705 - in libavfilter: checkout.sh diffs/02_ffmpeg_filters.diff diffs/03_libavfilter_doc.diff
stefano
subversion at mplayerhq.hu
Sun Mar 21 17:44:40 CET 2010
Author: stefano
Date: Sun Mar 21 17:44:40 2010
New Revision: 5705
Log:
Update to FFmpeg r22625 / libswscale r30945.
Modified:
libavfilter/checkout.sh
libavfilter/diffs/02_ffmpeg_filters.diff
libavfilter/diffs/03_libavfilter_doc.diff
Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh Sun Mar 21 17:44:06 2010 (r5704)
+++ libavfilter/checkout.sh Sun Mar 21 17:44:40 2010 (r5705)
@@ -1,11 +1,11 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r22589
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r22626
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
-svn up -r30869
+svn up -r30945
cd ../..
echo "patching ffmpeg"
Modified: libavfilter/diffs/02_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/02_ffmpeg_filters.diff Sun Mar 21 17:44:06 2010 (r5704)
+++ libavfilter/diffs/02_ffmpeg_filters.diff Sun Mar 21 17:44:40 2010 (r5705)
@@ -1,6 +1,6 @@
Index: ffmpeg.c
===================================================================
---- ffmpeg.c (revision 22508)
+--- ffmpeg.c (revision 22626)
+++ ffmpeg.c (working copy)
@@ -43,6 +43,13 @@
#include "libavutil/libm.h"
@@ -226,7 +226,7 @@ Index: ffmpeg.c
static void term_exit(void)
{
#if HAVE_TERMIOS_H
-@@ -464,6 +660,10 @@
+@@ -461,6 +657,10 @@
allocated_audio_buf_size= allocated_audio_out_size= 0;
av_free(samples);
@@ -237,7 +237,7 @@ Index: ffmpeg.c
if (received_sigterm) {
fprintf(stderr,
"Received signal %d: terminating.\n",
-@@ -896,7 +1096,9 @@
+@@ -893,7 +1093,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;
-@@ -942,6 +1144,9 @@
+@@ -941,6 +1143,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");
-@@ -953,6 +1158,7 @@
+@@ -952,6 +1157,7 @@
} else {
formatted_picture = in_picture;
}
@@ -265,7 +265,7 @@ Index: ffmpeg.c
final_picture = formatted_picture;
padding_src = formatted_picture;
-@@ -979,6 +1185,7 @@
+@@ -978,6 +1184,7 @@
av_exit(1);
}
@@ -273,7 +273,7 @@ Index: ffmpeg.c
if (ost->video_resample) {
padding_src = NULL;
final_picture = &ost->pict_tmp;
-@@ -1026,6 +1233,7 @@
+@@ -1025,6 +1232,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,
-@@ -1291,6 +1499,10 @@
+@@ -1290,6 +1498,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;
-@@ -1418,6 +1630,15 @@
+@@ -1417,6 +1629,15 @@
&buffer_to_free);
}
@@ -308,7 +308,7 @@ Index: ffmpeg.c
// preprocess audio (volume)
if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) {
if (audio_volume != 256) {
-@@ -1439,10 +1660,18 @@
+@@ -1438,10 +1659,18 @@
if (pts > now)
usleep(pts - now);
}
@@ -328,7 +328,7 @@ Index: ffmpeg.c
for(i=0;i<nb_ostreams;i++) {
int frame_size;
-@@ -1460,6 +1689,9 @@
+@@ -1459,6 +1688,9 @@
do_audio_out(os, ost, ist, decoded_data_buf, decoded_data_size);
break;
case CODEC_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);
-@@ -1528,7 +1760,17 @@
+@@ -1527,7 +1759,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) {
-@@ -1969,9 +2211,10 @@
+@@ -2009,9 +2251,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);
-@@ -1979,6 +2222,13 @@
+@@ -2019,6 +2262,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 CODEC_TYPE_SUBTITLE:
ost->encoding_needed = 1;
-@@ -2367,6 +2617,12 @@
+@@ -2417,6 +2667,12 @@
avcodec_close(ist->st->codec);
}
}
@@ -395,7 +395,7 @@ Index: ffmpeg.c
/* finished ! */
ret = 0;
-@@ -3960,6 +4216,9 @@
+@@ -4014,6 +4270,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,7 +405,7 @@ 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", "" },
-@@ -4020,6 +4279,9 @@
+@@ -4074,6 +4333,9 @@
avcodec_register_all();
avdevice_register_all();
Modified: libavfilter/diffs/03_libavfilter_doc.diff
==============================================================================
--- libavfilter/diffs/03_libavfilter_doc.diff Sun Mar 21 17:44:06 2010 (r5704)
+++ libavfilter/diffs/03_libavfilter_doc.diff Sun Mar 21 17:44:40 2010 (r5705)
@@ -1,6 +1,6 @@
Index: doc/libavfilter.texi
===================================================================
---- doc/libavfilter.texi (revision 22508)
+--- doc/libavfilter.texi (revision 22626)
+++ doc/libavfilter.texi (working copy)
@@ -139,6 +139,20 @@
More information about the FFmpeg-soc
mailing list