[FFmpeg-soc] [soc]: r5590 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff diffs/03_libavfilter_doc.diff
stefano
subversion at mplayerhq.hu
Sun Jan 24 15:18:33 CET 2010
Author: stefano
Date: Sun Jan 24 15:18:33 2010
New Revision: 5590
Log:
Update to FFmpeg r21414 / libswscale r30419.
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 Sat Jan 16 12:20:00 2010 (r5589)
+++ libavfilter/checkout.sh Sun Jan 24 15:18:33 2010 (r5590)
@@ -1,11 +1,11 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r21242
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r21414
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
-svn up -r30317
+svn up -r30419
cd ../..
echo "patching ffmpeg"
Modified: libavfilter/diffs/01_ffplay_filters.diff
==============================================================================
--- libavfilter/diffs/01_ffplay_filters.diff Sat Jan 16 12:20:00 2010 (r5589)
+++ libavfilter/diffs/01_ffplay_filters.diff Sun Jan 24 15:18:33 2010 (r5590)
@@ -1,6 +1,6 @@
Index: ffplay.c
===================================================================
---- ffplay.c (revision 21242)
+--- ffplay.c (revision 21414)
+++ ffplay.c (working copy)
@@ -30,6 +30,12 @@
#include "libavcodec/colorspace.h"
@@ -511,7 +511,7 @@ Index: ffplay.c
av_free(frame);
return 0;
}
-@@ -2138,6 +2426,12 @@
+@@ -2137,6 +2425,12 @@
/* free all pictures */
for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
vp = &is->pictq[i];
@@ -524,7 +524,7 @@ Index: ffplay.c
if (vp->bmp) {
SDL_FreeYUVOverlay(vp->bmp);
vp->bmp = NULL;
-@@ -2147,8 +2441,10 @@
+@@ -2146,8 +2440,10 @@
SDL_DestroyCond(is->pictq_cond);
SDL_DestroyMutex(is->subpq_mutex);
SDL_DestroyCond(is->subpq_cond);
@@ -535,7 +535,7 @@ Index: ffplay.c
av_free(is);
}
-@@ -2240,6 +2536,9 @@
+@@ -2239,6 +2535,9 @@
av_free(avcodec_opts[i]);
av_free(avformat_opts);
av_free(sws_opts);
@@ -545,7 +545,7 @@ Index: ffplay.c
if (show_status)
printf("\n");
SDL_Quit();
-@@ -2485,6 +2784,9 @@
+@@ -2484,6 +2783,9 @@
{ "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options", "bit_mask" },
{ "sync", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" },
{ "threads", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" },
@@ -555,7 +555,7 @@ Index: ffplay.c
{ "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
{ NULL, },
};
-@@ -2532,13 +2834,18 @@
+@@ -2531,13 +2833,18 @@
/* register all codecs, demux and protocols */
avcodec_register_all();
avdevice_register_all();
Modified: libavfilter/diffs/02_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/02_ffmpeg_filters.diff Sat Jan 16 12:20:00 2010 (r5589)
+++ libavfilter/diffs/02_ffmpeg_filters.diff Sun Jan 24 15:18:33 2010 (r5590)
@@ -1,6 +1,6 @@
Index: ffmpeg.c
===================================================================
---- ffmpeg.c (revision 21242)
+--- ffmpeg.c (revision 21414)
+++ ffmpeg.c (working copy)
@@ -41,6 +41,13 @@
#include "libavutil/avstring.h"
@@ -226,7 +226,7 @@ Index: ffmpeg.c
static void term_exit(void)
{
#if HAVE_TERMIOS_H
-@@ -454,6 +650,10 @@
+@@ -458,6 +654,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",
-@@ -883,7 +1083,9 @@
+@@ -890,7 +1090,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;
-@@ -929,6 +1131,9 @@
+@@ -936,6 +1138,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");
-@@ -940,6 +1145,7 @@
+@@ -947,6 +1152,7 @@
} else {
formatted_picture = in_picture;
}
@@ -265,7 +265,7 @@ Index: ffmpeg.c
final_picture = formatted_picture;
padding_src = formatted_picture;
-@@ -966,6 +1172,7 @@
+@@ -973,6 +1179,7 @@
av_exit(1);
}
@@ -273,7 +273,7 @@ Index: ffmpeg.c
if (ost->video_resample) {
padding_src = NULL;
final_picture = &ost->pict_tmp;
-@@ -1013,6 +1220,7 @@
+@@ -1020,6 +1227,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,
-@@ -1278,6 +1486,10 @@
+@@ -1285,6 +1493,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;
-@@ -1403,6 +1615,15 @@
+@@ -1410,6 +1622,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) {
-@@ -1424,10 +1645,18 @@
+@@ -1431,10 +1652,18 @@
if (pts > now)
usleep(pts - now);
}
@@ -328,7 +328,7 @@ Index: ffmpeg.c
for(i=0;i<nb_ostreams;i++) {
int frame_size;
-@@ -1445,6 +1674,9 @@
+@@ -1452,6 +1681,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);
-@@ -1510,7 +1742,17 @@
+@@ -1517,7 +1749,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) {
-@@ -1964,9 +2206,10 @@
+@@ -1971,9 +2213,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);
-@@ -1974,6 +2217,13 @@
+@@ -1981,6 +2224,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;
-@@ -2360,6 +2610,12 @@
+@@ -2367,6 +2617,12 @@
avcodec_close(ist->st->codec);
}
}
@@ -395,7 +395,7 @@ Index: ffmpeg.c
/* finished ! */
ret = 0;
-@@ -3917,6 +4173,9 @@
+@@ -3922,6 +4178,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", "" },
-@@ -3977,6 +4236,9 @@
+@@ -3982,6 +4241,9 @@
avcodec_register_all();
avdevice_register_all();
Modified: libavfilter/diffs/03_libavfilter_doc.diff
==============================================================================
--- libavfilter/diffs/03_libavfilter_doc.diff Sat Jan 16 12:20:00 2010 (r5589)
+++ libavfilter/diffs/03_libavfilter_doc.diff Sun Jan 24 15:18:33 2010 (r5590)
@@ -1,6 +1,6 @@
Index: doc/libavfilter.texi
===================================================================
---- doc/libavfilter.texi (revision 21242)
+--- doc/libavfilter.texi (revision 21414)
+++ doc/libavfilter.texi (working copy)
@@ -111,6 +111,20 @@
More information about the FFmpeg-soc
mailing list