[FFmpeg-soc] [soc]: r4362 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff
stefano
subversion at mplayerhq.hu
Sun May 31 18:45:58 CEST 2009
Author: stefano
Date: Sun May 31 18:45:57 2009
New Revision: 4362
Log:
Update to FFmpeg r19066.
Modified:
libavfilter/checkout.sh
libavfilter/diffs/01_ffplay_filters.diff
libavfilter/diffs/02_ffmpeg_filters.diff
Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh Sun May 31 17:02:18 2009 (r4361)
+++ libavfilter/checkout.sh Sun May 31 18:45:57 2009 (r4362)
@@ -1,7 +1,7 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r18854
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r19066
echo "patching ffmpeg"
for diff in $(ls $(pwd)/diffs/*.diff); do patch -d ffmpeg -p0 -i $diff; done
Modified: libavfilter/diffs/01_ffplay_filters.diff
==============================================================================
--- libavfilter/diffs/01_ffplay_filters.diff Sun May 31 17:02:18 2009 (r4361)
+++ libavfilter/diffs/01_ffplay_filters.diff Sun May 31 18:45:57 2009 (r4362)
@@ -1,9 +1,9 @@
Index: ffplay.c
===================================================================
---- ffplay.c (revision 18855)
+--- ffplay.c (revision 19066)
+++ ffplay.c (working copy)
-@@ -29,6 +29,12 @@
- #include "libavcodec/audioconvert.h"
+@@ -30,6 +30,12 @@
+ #include "libavcodec/colorspace.h"
#include "libavcodec/opt.h"
+#if CONFIG_AVFILTER
@@ -15,7 +15,7 @@ Index: ffplay.c
#include "cmdutils.h"
#include <SDL.h>
-@@ -67,7 +73,9 @@
+@@ -68,7 +74,9 @@
/* NOTE: the size must be big enough to compensate the hardware audio buffersize size */
#define SAMPLE_ARRAY_SIZE (2*65536)
@@ -25,7 +25,7 @@ Index: ffplay.c
typedef struct PacketQueue {
AVPacketList *first_pkt, *last_pkt;
-@@ -85,7 +93,12 @@
+@@ -86,7 +94,12 @@
double pts; ///<presentation time stamp for this picture
SDL_Overlay *bmp;
int width, height; /* source height & width */
@@ -38,7 +38,7 @@ Index: ffplay.c
} VideoPicture;
typedef struct SubPicture {
-@@ -168,11 +181,17 @@
+@@ -169,11 +182,17 @@
int pictq_size, pictq_rindex, pictq_windex;
SDL_mutex *pictq_mutex;
SDL_cond *pictq_cond;
@@ -56,7 +56,7 @@ Index: ffplay.c
} VideoState;
static void show_help(void);
-@@ -213,6 +232,9 @@
+@@ -214,6 +233,9 @@
static int error_recognition = FF_ER_CAREFUL;
static int error_concealment = 3;
static int decoder_reorder_pts= 0;
@@ -66,7 +66,7 @@ Index: ffplay.c
/* current context */
static int is_full_screen;
-@@ -662,6 +684,13 @@
+@@ -645,6 +667,13 @@
vp = &is->pictq[is->pictq_rindex];
if (vp->bmp) {
@@ -80,7 +80,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);
-@@ -669,9 +698,10 @@
+@@ -652,9 +681,10 @@
aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio);
else
aspect_ratio = 0;
@@ -92,7 +92,7 @@ Index: ffplay.c
/* if an active format is indicated, then it overrides the
mpeg format */
#if 0
-@@ -874,9 +904,15 @@
+@@ -857,9 +887,15 @@
} else if(!is_full_screen && screen_width){
w = screen_width;
h = screen_height;
@@ -108,7 +108,7 @@ Index: ffplay.c
} else {
w = 640;
h = 480;
-@@ -1189,6 +1225,20 @@
+@@ -1172,6 +1208,20 @@
if (vp->bmp)
SDL_FreeYUVOverlay(vp->bmp);
@@ -129,7 +129,7 @@ Index: ffplay.c
#if 0
/* XXX: use generic function */
/* XXX: disable overlay if no hardware acceleration or if RGB format */
-@@ -1206,12 +1256,9 @@
+@@ -1189,12 +1239,9 @@
break;
}
#endif
@@ -143,7 +143,7 @@ Index: ffplay.c
SDL_LockMutex(is->pictq_mutex);
vp->allocated = 1;
-@@ -1227,7 +1274,9 @@
+@@ -1210,7 +1257,9 @@
{
VideoPicture *vp;
int dst_pix_fmt;
@@ -154,7 +154,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 &&
-@@ -1243,8 +1292,13 @@
+@@ -1226,8 +1275,13 @@
/* alloc or resize hardware picture buffer */
if (!vp->bmp ||
@@ -168,7 +168,7 @@ Index: ffplay.c
SDL_Event event;
vp->allocated = 0;
-@@ -1269,6 +1323,11 @@
+@@ -1252,6 +1306,11 @@
/* if the frame is not skipped, then display it */
if (vp->bmp) {
AVPicture pict;
@@ -180,7 +180,7 @@ Index: ffplay.c
/* get a pointer on the bitmap */
SDL_LockYUVOverlay (vp->bmp);
-@@ -1282,18 +1341,30 @@
+@@ -1265,18 +1324,30 @@
pict.linesize[0] = vp->bmp->pitches[0];
pict.linesize[1] = vp->bmp->pitches[2];
pict.linesize[2] = vp->bmp->pitches[1];
@@ -215,7 +215,7 @@ Index: ffplay.c
/* update the bitmap content */
SDL_UnlockYUVOverlay(vp->bmp);
-@@ -1348,54 +1419,269 @@
+@@ -1331,54 +1402,269 @@
return queue_picture(is, src_frame, pts);
}
@@ -516,7 +516,7 @@ Index: ffplay.c
av_free(frame);
return 0;
}
-@@ -2179,6 +2465,12 @@
+@@ -2162,6 +2448,12 @@
/* free all pictures */
for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
vp = &is->pictq[i];
@@ -529,7 +529,7 @@ Index: ffplay.c
if (vp->bmp) {
SDL_FreeYUVOverlay(vp->bmp);
vp->bmp = NULL;
-@@ -2188,8 +2480,10 @@
+@@ -2171,8 +2463,10 @@
SDL_DestroyCond(is->pictq_cond);
SDL_DestroyMutex(is->subpq_mutex);
SDL_DestroyCond(is->subpq_cond);
@@ -540,7 +540,7 @@ Index: ffplay.c
av_free(is);
}
-@@ -2281,6 +2575,9 @@
+@@ -2264,6 +2558,9 @@
av_free(avcodec_opts[i]);
av_free(avformat_opts);
av_free(sws_opts);
@@ -550,7 +550,7 @@ Index: ffplay.c
if (show_status)
printf("\n");
SDL_Quit();
-@@ -2525,6 +2822,9 @@
+@@ -2512,6 +2809,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" },
@@ -560,7 +560,7 @@ Index: ffplay.c
{ "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
{ NULL, },
};
-@@ -2573,7 +2873,9 @@
+@@ -2560,7 +2860,9 @@
avcodec_opts[i]= avcodec_alloc_context2(i);
}
avformat_opts = avformat_alloc_context();
Modified: libavfilter/diffs/02_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/02_ffmpeg_filters.diff Sun May 31 17:02:18 2009 (r4361)
+++ libavfilter/diffs/02_ffmpeg_filters.diff Sun May 31 18:45:57 2009 (r4362)
@@ -1,8 +1,8 @@
Index: ffmpeg.c
===================================================================
---- ffmpeg.c (revision 18829)
+--- ffmpeg.c (revision 19066)
+++ ffmpeg.c (working copy)
-@@ -40,6 +40,13 @@
+@@ -41,6 +41,13 @@
#include "libavutil/avstring.h"
#include "libavformat/os_support.h"
@@ -16,7 +16,7 @@ Index: ffmpeg.c
#if HAVE_SYS_RESOURCE_H
#include <sys/types.h>
#include <sys/resource.h>
-@@ -147,6 +154,10 @@
+@@ -148,6 +155,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;
-@@ -287,6 +298,13 @@
+@@ -288,6 +299,13 @@
is not defined */
int64_t pts; /* current pts */
int is_start; /* is 1 at the start and after a discontinuity */
@@ -41,7 +41,7 @@ Index: ffmpeg.c
} AVInputStream;
typedef struct AVInputFile {
-@@ -302,6 +320,185 @@
+@@ -303,6 +321,185 @@
static struct termios oldtty;
#endif
@@ -227,7 +227,7 @@ Index: ffmpeg.c
static void term_exit(void)
{
#if HAVE_TERMIOS_H
-@@ -442,6 +639,10 @@
+@@ -443,6 +640,10 @@
av_free(audio_out2);
av_free(samples);
@@ -238,7 +238,7 @@ Index: ffmpeg.c
if (received_sigterm) {
fprintf(stderr,
"Received signal %d: terminating.\n",
-@@ -892,6 +1093,9 @@
+@@ -893,6 +1094,9 @@
if (nb_frames <= 0)
return;
@@ -248,7 +248,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");
-@@ -903,6 +1107,7 @@
+@@ -904,6 +1108,7 @@
} else {
formatted_picture = in_picture;
}
@@ -256,7 +256,7 @@ Index: ffmpeg.c
final_picture = formatted_picture;
padding_src = formatted_picture;
-@@ -920,12 +1125,14 @@
+@@ -921,12 +1126,14 @@
}
}
@@ -346,7 +346,7 @@ Index: ffmpeg.c
av_free(buffer_to_free);
/* XXX: allocate the subtitles in the codec ? */
if (subtitle_to_free) {
-@@ -1858,11 +2099,22 @@
+@@ -1867,11 +2108,22 @@
fprintf(stderr, "Cannot get resampling context\n");
av_exit(1);
}
@@ -369,7 +369,7 @@ Index: ffmpeg.c
break;
case CODEC_TYPE_SUBTITLE:
ost->encoding_needed = 1;
-@@ -2247,6 +2499,12 @@
+@@ -2256,6 +2508,12 @@
avcodec_close(ist->st->codec);
}
}
@@ -382,7 +382,7 @@ Index: ffmpeg.c
/* finished ! */
ret = 0;
-@@ -3880,6 +4138,9 @@
+@@ -3872,6 +4130,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" },
More information about the FFmpeg-soc
mailing list