[FFmpeg-soc] [soc]: r5632 - 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 Feb 25 22:27:10 CET 2010
Author: stefano
Date: Thu Feb 25 22:27:10 2010
New Revision: 5632
Log:
Update to FFmpeg r22063 / libswscale r30730.
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 Feb 25 22:04:26 2010 (r5631)
+++ libavfilter/checkout.sh Thu Feb 25 22:27:10 2010 (r5632)
@@ -1,11 +1,11 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r21854
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r22063
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
-svn up -r30520
+svn up -r30730
cd ../..
echo "patching ffmpeg"
Modified: libavfilter/diffs/01_ffplay_filters.diff
==============================================================================
--- libavfilter/diffs/01_ffplay_filters.diff Thu Feb 25 22:04:26 2010 (r5631)
+++ libavfilter/diffs/01_ffplay_filters.diff Thu Feb 25 22:27:10 2010 (r5632)
@@ -1,6 +1,6 @@
Index: ffplay.c
===================================================================
---- ffplay.c (revision 21854)
+--- ffplay.c (revision 22063)
+++ ffplay.c (working copy)
@@ -32,6 +32,12 @@
#include "libavcodec/opt.h"
@@ -57,7 +57,7 @@ Index: ffplay.c
} VideoState;
static void show_help(void);
-@@ -232,6 +250,9 @@
+@@ -234,6 +252,9 @@
static int error_concealment = 3;
static int decoder_reorder_pts= -1;
static int autoexit;
@@ -67,7 +67,7 @@ Index: ffplay.c
/* current context */
static int is_full_screen;
-@@ -666,6 +687,13 @@
+@@ -668,6 +689,13 @@
vp = &is->pictq[is->pictq_rindex];
if (vp->bmp) {
@@ -81,7 +81,7 @@ Index: ffplay.c
/* XXX: use variable in the frame */
if (is->video_st->sample_aspect_ratio.num)
aspect_ratio = av_q2d(is->video_st->sample_aspect_ratio);
-@@ -673,9 +701,10 @@
+@@ -675,9 +703,10 @@
aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio);
else
aspect_ratio = 0;
@@ -93,7 +93,7 @@ Index: ffplay.c
/* if an active format is indicated, then it overrides the
mpeg format */
#if 0
-@@ -925,9 +954,15 @@
+@@ -927,9 +956,15 @@
} else if(!is_full_screen && screen_width){
w = screen_width;
h = screen_height;
@@ -109,7 +109,7 @@ Index: ffplay.c
} else {
w = 640;
h = 480;
-@@ -1239,12 +1274,23 @@
+@@ -1241,12 +1276,23 @@
if (vp->bmp)
SDL_FreeYUVOverlay(vp->bmp);
@@ -137,7 +137,7 @@ Index: ffplay.c
SDL_LockMutex(is->pictq_mutex);
vp->allocated = 1;
-@@ -1260,7 +1306,9 @@
+@@ -1262,7 +1308,9 @@
{
VideoPicture *vp;
int dst_pix_fmt;
@@ -148,7 +148,7 @@ Index: ffplay.c
/* wait until we have space to put a new picture */
SDL_LockMutex(is->pictq_mutex);
while (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE &&
-@@ -1276,8 +1324,13 @@
+@@ -1278,8 +1326,13 @@
/* alloc or resize hardware picture buffer */
if (!vp->bmp ||
@@ -162,7 +162,7 @@ Index: ffplay.c
SDL_Event event;
vp->allocated = 0;
-@@ -1302,6 +1355,11 @@
+@@ -1304,6 +1357,11 @@
/* if the frame is not skipped, then display it */
if (vp->bmp) {
AVPicture pict;
@@ -174,7 +174,7 @@ Index: ffplay.c
/* get a pointer on the bitmap */
SDL_LockYUVOverlay (vp->bmp);
-@@ -1315,18 +1373,30 @@
+@@ -1317,18 +1375,30 @@
pict.linesize[0] = vp->bmp->pitches[0];
pict.linesize[1] = vp->bmp->pitches[2];
pict.linesize[2] = vp->bmp->pitches[1];
@@ -209,7 +209,7 @@ Index: ffplay.c
/* update the bitmap content */
SDL_UnlockYUVOverlay(vp->bmp);
-@@ -1384,89 +1454,308 @@
+@@ -1386,89 +1456,308 @@
return queue_picture(is, src_frame, pts, pos);
}
@@ -581,7 +581,7 @@ Index: ffplay.c
av_free(frame);
return 0;
}
-@@ -2251,6 +2540,12 @@
+@@ -2265,6 +2554,12 @@
/* free all pictures */
for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
vp = &is->pictq[i];
@@ -594,7 +594,7 @@ Index: ffplay.c
if (vp->bmp) {
SDL_FreeYUVOverlay(vp->bmp);
vp->bmp = NULL;
-@@ -2260,8 +2555,10 @@
+@@ -2274,8 +2569,10 @@
SDL_DestroyCond(is->pictq_cond);
SDL_DestroyMutex(is->subpq_mutex);
SDL_DestroyCond(is->subpq_cond);
@@ -605,7 +605,7 @@ Index: ffplay.c
av_free(is);
}
-@@ -2353,6 +2650,9 @@
+@@ -2367,6 +2664,9 @@
av_free(avcodec_opts[i]);
av_free(avformat_opts);
av_free(sws_opts);
@@ -615,7 +615,7 @@ Index: ffplay.c
if (show_status)
printf("\n");
SDL_Quit();
-@@ -2623,6 +2923,9 @@
+@@ -2637,6 +2937,9 @@
{ "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" },
{ "autoexit", OPT_BOOL | OPT_EXPERT, {(void*)&autoexit}, "exit at the end", "" },
@@ -625,7 +625,7 @@ Index: ffplay.c
{ "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
{ NULL, },
};
-@@ -2670,13 +2973,18 @@
+@@ -2684,13 +2987,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 Thu Feb 25 22:04:26 2010 (r5631)
+++ libavfilter/diffs/02_ffmpeg_filters.diff Thu Feb 25 22:27:10 2010 (r5632)
@@ -1,6 +1,6 @@
Index: ffmpeg.c
===================================================================
---- ffmpeg.c (revision 21854)
+--- ffmpeg.c (revision 22063)
+++ ffmpeg.c (working copy)
@@ -42,6 +42,13 @@
#include "libavutil/avstring.h"
@@ -15,8 +15,8 @@ Index: ffmpeg.c
+
#if HAVE_SYS_RESOURCE_H
#include <sys/types.h>
- #include <sys/resource.h>
-@@ -144,6 +151,10 @@
+ #include <sys/time.h>
+@@ -149,6 +156,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;
-@@ -302,6 +313,13 @@
+@@ -307,6 +318,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 {
-@@ -317,6 +335,184 @@
+@@ -322,6 +340,184 @@
static struct termios oldtty;
#endif
@@ -226,7 +226,7 @@ Index: ffmpeg.c
static void term_exit(void)
{
#if HAVE_TERMIOS_H
-@@ -461,6 +657,10 @@
+@@ -466,6 +662,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",
-@@ -893,7 +1093,9 @@
+@@ -898,7 +1098,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;
-@@ -939,6 +1141,9 @@
+@@ -944,6 +1146,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");
-@@ -950,6 +1155,7 @@
+@@ -955,6 +1160,7 @@
} else {
formatted_picture = in_picture;
}
@@ -265,7 +265,7 @@ Index: ffmpeg.c
final_picture = formatted_picture;
padding_src = formatted_picture;
-@@ -976,6 +1182,7 @@
+@@ -981,6 +1187,7 @@
av_exit(1);
}
@@ -273,7 +273,7 @@ Index: ffmpeg.c
if (ost->video_resample) {
padding_src = NULL;
final_picture = &ost->pict_tmp;
-@@ -1023,6 +1230,7 @@
+@@ -1028,6 +1235,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,
-@@ -1288,6 +1496,10 @@
+@@ -1293,6 +1501,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;
-@@ -1415,6 +1627,15 @@
+@@ -1420,6 +1632,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) {
-@@ -1436,10 +1657,18 @@
+@@ -1441,10 +1662,18 @@
if (pts > now)
usleep(pts - now);
}
@@ -328,7 +328,7 @@ Index: ffmpeg.c
for(i=0;i<nb_ostreams;i++) {
int frame_size;
-@@ -1457,6 +1686,9 @@
+@@ -1462,6 +1691,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);
-@@ -1525,7 +1757,17 @@
+@@ -1530,7 +1762,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) {
-@@ -1979,9 +2221,10 @@
+@@ -1967,9 +2209,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);
-@@ -1989,6 +2232,13 @@
+@@ -1977,6 +2220,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;
-@@ -2374,6 +2624,12 @@
+@@ -2364,6 +2614,12 @@
avcodec_close(ist->st->codec);
}
}
@@ -395,7 +395,7 @@ Index: ffmpeg.c
/* finished ! */
ret = 0;
-@@ -3928,6 +4184,9 @@
+@@ -3953,6 +4209,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", "" },
-@@ -3988,6 +4247,9 @@
+@@ -4013,6 +4272,9 @@
avcodec_register_all();
avdevice_register_all();
Modified: libavfilter/diffs/03_libavfilter_doc.diff
==============================================================================
--- libavfilter/diffs/03_libavfilter_doc.diff Thu Feb 25 22:04:26 2010 (r5631)
+++ libavfilter/diffs/03_libavfilter_doc.diff Thu Feb 25 22:27:10 2010 (r5632)
@@ -1,8 +1,8 @@
Index: doc/libavfilter.texi
===================================================================
---- doc/libavfilter.texi (revision 21854)
+--- doc/libavfilter.texi (revision 22063)
+++ doc/libavfilter.texi (working copy)
-@@ -111,6 +111,20 @@
+@@ -139,6 +139,20 @@
The default value of ``width'' and ``height'' is 0.
@@ -23,7 +23,7 @@ Index: doc/libavfilter.texi
@section format
Convert the input video to one of the specified pixel formats.
-@@ -128,6 +142,30 @@
+@@ -156,6 +170,30 @@
will convert the input video to the format ``yuv420p''.
@@ -54,7 +54,7 @@ Index: doc/libavfilter.texi
@section noformat
Force libavfilter not to use any of the specified pixel formats for the
-@@ -149,6 +187,98 @@
+@@ -177,6 +215,98 @@
Pass the source unchanged to the output.
@@ -153,7 +153,7 @@ Index: doc/libavfilter.texi
@section scale
Scale the input video to width:height and/or convert the image format.
-@@ -174,6 +304,24 @@
+@@ -202,6 +332,24 @@
The default value of ``width'' and ``height'' is 0.
@@ -178,7 +178,7 @@ Index: doc/libavfilter.texi
@section slicify
Pass the images of input video on to next video filter as multiple
-@@ -189,6 +337,19 @@
+@@ -217,6 +365,19 @@
Adding this in the beginning of filter chains should make filtering
faster due to better use of the memory cache.
@@ -198,7 +198,7 @@ Index: doc/libavfilter.texi
@section vflip
Flip the input video vertically.
-@@ -201,6 +362,32 @@
+@@ -229,6 +390,32 @@
Below is a description of the currently available video sources.
More information about the FFmpeg-soc
mailing list