[FFmpeg-soc] [soc]: r5524 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff diffs/03_libavfilter_doc.diff
stefano
subversion at mplayerhq.hu
Thu Dec 10 19:53:28 CET 2009
Author: stefano
Date: Thu Dec 10 19:53:27 2009
New Revision: 5524
Log:
Update to FFmpeg r20790 / libswscale r29978.
Modified:
libavfilter/checkout.sh
libavfilter/diffs/01_ffplay_filters.diff
libavfilter/diffs/02_ffmpeg_filters.diff
libavfilter/diffs/03_libavfilter_doc.diff
Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh Thu Dec 10 02:21:27 2009 (r5523)
+++ libavfilter/checkout.sh Thu Dec 10 19:53:27 2009 (r5524)
@@ -1,11 +1,11 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20735
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20790
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
-svn up -r29974
+svn up -r29978
cd ../..
echo "patching ffmpeg"
Modified: libavfilter/diffs/01_ffplay_filters.diff
==============================================================================
--- libavfilter/diffs/01_ffplay_filters.diff Thu Dec 10 02:21:27 2009 (r5523)
+++ libavfilter/diffs/01_ffplay_filters.diff Thu Dec 10 19:53:27 2009 (r5524)
@@ -1,6 +1,6 @@
Index: ffplay.c
===================================================================
---- ffplay.c (revision 20735)
+--- ffplay.c (revision 20790)
+++ ffplay.c (working copy)
@@ -30,6 +30,12 @@
#include "libavcodec/colorspace.h"
Modified: libavfilter/diffs/02_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/02_ffmpeg_filters.diff Thu Dec 10 02:21:27 2009 (r5523)
+++ libavfilter/diffs/02_ffmpeg_filters.diff Thu Dec 10 19:53:27 2009 (r5524)
@@ -1,6 +1,6 @@
Index: ffmpeg.c
===================================================================
---- ffmpeg.c (revision 20735)
+--- ffmpeg.c (revision 20790)
+++ ffmpeg.c (working copy)
@@ -41,6 +41,13 @@
#include "libavutil/avstring.h"
@@ -229,7 +229,7 @@ Index: ffmpeg.c
{
#if HAVE_TERMIOS_H
@@ -453,6 +651,10 @@
- av_free(audio_out2);
+ allocated_audio_buf_size= allocated_audio_out_size= 0;
av_free(samples);
+#if CONFIG_AVFILTER
@@ -239,7 +239,7 @@ Index: ffmpeg.c
if (received_sigterm) {
fprintf(stderr,
"Received signal %d: terminating.\n",
-@@ -867,7 +1069,9 @@
+@@ -882,7 +1084,9 @@
int *frame_size)
{
int nb_frames, i, ret;
@@ -249,7 +249,7 @@ Index: ffmpeg.c
AVFrame *final_picture, *formatted_picture, *resampling_dst, *padding_src;
AVFrame picture_crop_temp, picture_pad_temp;
AVCodecContext *enc, *dec;
-@@ -913,6 +1117,9 @@
+@@ -928,6 +1132,9 @@
if (nb_frames <= 0)
return;
@@ -259,7 +259,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");
-@@ -924,6 +1131,7 @@
+@@ -939,6 +1146,7 @@
} else {
formatted_picture = in_picture;
}
@@ -267,7 +267,7 @@ Index: ffmpeg.c
final_picture = formatted_picture;
padding_src = formatted_picture;
-@@ -950,6 +1158,7 @@
+@@ -965,6 +1173,7 @@
av_exit(1);
}
@@ -275,7 +275,7 @@ Index: ffmpeg.c
if (ost->video_resample) {
padding_src = NULL;
final_picture = &ost->pict_tmp;
-@@ -997,6 +1206,7 @@
+@@ -1012,6 +1221,7 @@
sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize,
0, ost->resample_height, resampling_dst->data, resampling_dst->linesize);
}
@@ -283,7 +283,7 @@ Index: ffmpeg.c
if (ost->video_pad) {
av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
-@@ -1263,6 +1473,10 @@
+@@ -1278,6 +1488,10 @@
static unsigned int samples_size= 0;
AVSubtitle subtitle, *subtitle_to_free;
int got_subtitle;
@@ -294,7 +294,7 @@ Index: ffmpeg.c
AVPacket avpkt;
int bps = av_get_bits_per_sample_format(ist->st->codec->sample_fmt)>>3;
-@@ -1385,6 +1599,15 @@
+@@ -1400,6 +1614,15 @@
&buffer_to_free);
}
@@ -310,7 +310,7 @@ Index: ffmpeg.c
// preprocess audio (volume)
if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) {
if (audio_volume != 256) {
-@@ -1406,10 +1629,18 @@
+@@ -1421,10 +1644,18 @@
if (pts > now)
usleep(pts - now);
}
@@ -330,7 +330,7 @@ Index: ffmpeg.c
for(i=0;i<nb_ostreams;i++) {
int frame_size;
-@@ -1426,6 +1657,9 @@
+@@ -1441,6 +1672,9 @@
do_audio_out(os, ost, ist, data_buf, data_size);
break;
case CODEC_TYPE_VIDEO:
@@ -340,7 +340,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);
-@@ -1491,7 +1725,17 @@
+@@ -1506,7 +1740,17 @@
av_free_packet(&opkt);
}
}
@@ -358,7 +358,7 @@ Index: ffmpeg.c
av_free(buffer_to_free);
/* XXX: allocate the subtitles in the codec ? */
if (subtitle_to_free) {
-@@ -1945,9 +2189,10 @@
+@@ -1960,9 +2204,10 @@
av_exit(1);
}
@@ -370,7 +370,7 @@ Index: ffmpeg.c
codec->bits_per_raw_sample= 0;
}
ost->resample_height = icodec->height - (frame_topBand + frame_bottomBand);
-@@ -1955,6 +2200,13 @@
+@@ -1970,6 +2215,13 @@
ost->resample_pix_fmt= icodec->pix_fmt;
ost->encoding_needed = 1;
ist->decoding_needed = 1;
@@ -384,7 +384,7 @@ Index: ffmpeg.c
break;
case CODEC_TYPE_SUBTITLE:
ost->encoding_needed = 1;
-@@ -2341,6 +2593,12 @@
+@@ -2356,6 +2608,12 @@
avcodec_close(ist->st->codec);
}
}
@@ -397,7 +397,7 @@ Index: ffmpeg.c
/* finished ! */
ret = 0;
-@@ -3899,6 +4157,9 @@
+@@ -3918,6 +4176,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" },
Modified: libavfilter/diffs/03_libavfilter_doc.diff
==============================================================================
--- libavfilter/diffs/03_libavfilter_doc.diff Thu Dec 10 02:21:27 2009 (r5523)
+++ libavfilter/diffs/03_libavfilter_doc.diff Thu Dec 10 19:53:27 2009 (r5524)
@@ -1,6 +1,6 @@
Index: doc/libavfilter.texi
===================================================================
---- doc/libavfilter.texi (revision 20735)
+--- doc/libavfilter.texi (revision 20790)
+++ doc/libavfilter.texi (working copy)
@@ -111,6 +111,20 @@
More information about the FFmpeg-soc
mailing list