[FFmpeg-soc] [soc]: r5655 - in libavfilter: checkout.sh diffs/02_ffmpeg_filters.diff diffs/03_libavfilter_doc.diff vsrc_buffer.c vsrc_movie.c
stefano
subversion at mplayerhq.hu
Sat Mar 13 13:02:15 CET 2010
Author: stefano
Date: Sat Mar 13 13:02:15 2010
New Revision: 5655
Log:
Update to FFmpeg r22508 / libswscale r30869.
Modified:
libavfilter/checkout.sh
libavfilter/diffs/02_ffmpeg_filters.diff
libavfilter/diffs/03_libavfilter_doc.diff
libavfilter/vsrc_buffer.c
libavfilter/vsrc_movie.c
Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh Sat Mar 13 12:42:36 2010 (r5654)
+++ libavfilter/checkout.sh Sat Mar 13 13:02:15 2010 (r5655)
@@ -1,11 +1,11 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r22232
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r22508
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
-svn up -r30856
+svn up -r30869
cd ../..
echo "patching ffmpeg"
Modified: libavfilter/diffs/02_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/02_ffmpeg_filters.diff Sat Mar 13 12:42:36 2010 (r5654)
+++ libavfilter/diffs/02_ffmpeg_filters.diff Sat Mar 13 13:02:15 2010 (r5655)
@@ -1,9 +1,9 @@
Index: ffmpeg.c
===================================================================
---- ffmpeg.c (revision 22063)
+--- ffmpeg.c (revision 22508)
+++ ffmpeg.c (working copy)
-@@ -42,6 +42,13 @@
- #include "libavutil/avstring.h"
+@@ -43,6 +43,13 @@
+ #include "libavutil/libm.h"
#include "libavformat/os_support.h"
+#if CONFIG_AVFILTER
@@ -16,7 +16,7 @@ Index: ffmpeg.c
#if HAVE_SYS_RESOURCE_H
#include <sys/types.h>
#include <sys/time.h>
-@@ -149,6 +156,10 @@
+@@ -147,6 +154,10 @@
static int loop_input = 0;
static int loop_output = AVFMT_NOOUTPUTLOOP;
static int qp_hist = 0;
@@ -27,7 +27,7 @@ Index: ffmpeg.c
static int intra_only = 0;
static int audio_sample_rate = 44100;
-@@ -307,6 +318,13 @@
+@@ -305,6 +316,13 @@
int is_start; /* is 1 at the start and after a discontinuity */
int showed_multi_packet_warning;
int is_past_recording_time;
@@ -41,7 +41,7 @@ Index: ffmpeg.c
} AVInputStream;
typedef struct AVInputFile {
-@@ -322,6 +340,184 @@
+@@ -320,6 +338,184 @@
static struct termios oldtty;
#endif
@@ -226,7 +226,7 @@ Index: ffmpeg.c
static void term_exit(void)
{
#if HAVE_TERMIOS_H
-@@ -466,6 +662,10 @@
+@@ -464,6 +660,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",
-@@ -898,7 +1098,9 @@
+@@ -896,7 +1096,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;
-@@ -944,6 +1146,9 @@
+@@ -942,6 +1144,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");
-@@ -955,6 +1160,7 @@
+@@ -953,6 +1158,7 @@
} else {
formatted_picture = in_picture;
}
@@ -265,7 +265,7 @@ Index: ffmpeg.c
final_picture = formatted_picture;
padding_src = formatted_picture;
-@@ -981,6 +1187,7 @@
+@@ -979,6 +1185,7 @@
av_exit(1);
}
@@ -273,7 +273,7 @@ Index: ffmpeg.c
if (ost->video_resample) {
padding_src = NULL;
final_picture = &ost->pict_tmp;
-@@ -1028,6 +1235,7 @@
+@@ -1026,6 +1233,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,
-@@ -1293,6 +1501,10 @@
+@@ -1291,6 +1499,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;
-@@ -1420,6 +1632,15 @@
+@@ -1418,6 +1630,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) {
-@@ -1441,10 +1662,18 @@
+@@ -1439,10 +1660,18 @@
if (pts > now)
usleep(pts - now);
}
@@ -328,7 +328,7 @@ Index: ffmpeg.c
for(i=0;i<nb_ostreams;i++) {
int frame_size;
-@@ -1462,6 +1691,9 @@
+@@ -1460,6 +1689,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);
-@@ -1530,7 +1762,17 @@
+@@ -1528,7 +1760,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) {
-@@ -1967,9 +2209,10 @@
+@@ -1969,9 +2211,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);
-@@ -1977,6 +2220,13 @@
+@@ -1979,6 +2222,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;
-@@ -2364,6 +2614,12 @@
+@@ -2367,6 +2617,12 @@
avcodec_close(ist->st->codec);
}
}
@@ -395,7 +395,7 @@ Index: ffmpeg.c
/* finished ! */
ret = 0;
-@@ -3953,6 +4209,9 @@
+@@ -3960,6 +4216,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", "" },
-@@ -4013,6 +4272,9 @@
+@@ -4020,6 +4279,9 @@
avcodec_register_all();
avdevice_register_all();
Modified: libavfilter/diffs/03_libavfilter_doc.diff
==============================================================================
--- libavfilter/diffs/03_libavfilter_doc.diff Sat Mar 13 12:42:36 2010 (r5654)
+++ libavfilter/diffs/03_libavfilter_doc.diff Sat Mar 13 13:02:15 2010 (r5655)
@@ -1,6 +1,6 @@
Index: doc/libavfilter.texi
===================================================================
---- doc/libavfilter.texi (revision 22063)
+--- doc/libavfilter.texi (revision 22508)
+++ doc/libavfilter.texi (working copy)
@@ -139,6 +139,20 @@
Modified: libavfilter/vsrc_buffer.c
==============================================================================
--- libavfilter/vsrc_buffer.c Sat Mar 13 12:42:36 2010 (r5654)
+++ libavfilter/vsrc_buffer.c Sat Mar 13 13:02:15 2010 (r5655)
@@ -20,6 +20,7 @@
*/
#include "avfilter.h"
+#include "vsrc_buffer.h"
typedef struct {
int64_t pts;
Modified: libavfilter/vsrc_movie.c
==============================================================================
--- libavfilter/vsrc_movie.c Sat Mar 13 12:42:36 2010 (r5654)
+++ libavfilter/vsrc_movie.c Sat Mar 13 13:02:15 2010 (r5655)
@@ -43,7 +43,7 @@ typedef struct {
AVFilterPicRef *pic;
} MovieContext;
-int movie_init(AVFilterContext *ctx)
+static int movie_init(AVFilterContext *ctx)
{
AVInputFormat *file_iformat = NULL;
int i;
@@ -165,7 +165,7 @@ static int config_props(AVFilterLink *li
return 0;
}
-int movie_get_frame(AVFilterLink *link)
+static int movie_get_frame(AVFilterLink *link)
{
AVPacket packet;
int frame_finished;
More information about the FFmpeg-soc
mailing list