[FFmpeg-soc] [soc]: r3950 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff
stefano
subversion at mplayerhq.hu
Mon Jan 12 00:33:12 CET 2009
Author: stefano
Date: Mon Jan 12 00:33:12 2009
New Revision: 3950
Log:
Update to FFmpeg r16562.
Modified:
libavfilter/checkout.sh
libavfilter/diffs/01_ffplay_filters.diff
libavfilter/diffs/02_ffmpeg_filters.diff
Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh Mon Jan 12 00:23:20 2009 (r3949)
+++ libavfilter/checkout.sh Mon Jan 12 00:33:12 2009 (r3950)
@@ -1,7 +1,7 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r16172
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r16562
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 Mon Jan 12 00:23:20 2009 (r3949)
+++ libavfilter/diffs/01_ffplay_filters.diff Mon Jan 12 00:33:12 2009 (r3950)
@@ -1,6 +1,6 @@
Index: ffplay.c
===================================================================
---- ffplay.c (revision 16172)
+--- ffplay.c (revision 16562)
+++ ffplay.c (working copy)
@@ -29,6 +29,12 @@
#include "libavcodec/audioconvert.h"
@@ -59,7 +59,7 @@ Index: ffplay.c
/* current context */
static int is_full_screen;
-@@ -657,6 +677,13 @@
+@@ -658,6 +678,13 @@
vp = &is->pictq[is->pictq_rindex];
if (vp->bmp) {
@@ -73,7 +73,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);
-@@ -664,9 +691,10 @@
+@@ -665,9 +692,10 @@
aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio);
else
aspect_ratio = 0;
@@ -85,7 +85,7 @@ Index: ffplay.c
/* if an active format is indicated, then it overrides the
mpeg format */
#if 0
-@@ -869,9 +897,15 @@
+@@ -870,9 +898,15 @@
} else if(!is_full_screen && screen_width){
w = screen_width;
h = screen_height;
@@ -101,7 +101,7 @@ Index: ffplay.c
} else {
w = 640;
h = 480;
-@@ -1176,6 +1210,20 @@
+@@ -1177,6 +1211,20 @@
if (vp->bmp)
SDL_FreeYUVOverlay(vp->bmp);
@@ -122,7 +122,7 @@ Index: ffplay.c
#if 0
/* XXX: use generic function */
/* XXX: disable overlay if no hardware acceleration or if RGB format */
-@@ -1193,12 +1241,9 @@
+@@ -1194,12 +1242,9 @@
break;
}
#endif
@@ -136,7 +136,7 @@ Index: ffplay.c
SDL_LockMutex(is->pictq_mutex);
vp->allocated = 1;
-@@ -1215,8 +1260,11 @@
+@@ -1216,8 +1261,11 @@
VideoPicture *vp;
int dst_pix_fmt;
AVPicture pict;
@@ -149,7 +149,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 &&
-@@ -1232,8 +1280,13 @@
+@@ -1233,8 +1281,13 @@
/* alloc or resize hardware picture buffer */
if (!vp->bmp ||
@@ -163,7 +163,7 @@ Index: ffplay.c
SDL_Event event;
vp->allocated = 0;
-@@ -1257,6 +1310,12 @@
+@@ -1258,6 +1311,12 @@
/* if the frame is not skipped, then display it */
if (vp->bmp) {
@@ -176,7 +176,7 @@ Index: ffplay.c
/* get a pointer on the bitmap */
SDL_LockYUVOverlay (vp->bmp);
-@@ -1268,18 +1327,30 @@
+@@ -1269,18 +1328,30 @@
pict.linesize[0] = vp->bmp->pitches[0];
pict.linesize[1] = vp->bmp->pitches[2];
pict.linesize[2] = vp->bmp->pitches[1];
@@ -211,7 +211,7 @@ Index: ffplay.c
/* update the bitmap content */
SDL_UnlockYUVOverlay(vp->bmp);
-@@ -1334,54 +1405,264 @@
+@@ -1335,54 +1406,264 @@
return queue_picture(is, src_frame, pts);
}
@@ -507,7 +507,7 @@ Index: ffplay.c
av_free(frame);
return 0;
}
-@@ -2161,6 +2442,12 @@
+@@ -2170,6 +2451,12 @@
/* free all pictures */
for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
vp = &is->pictq[i];
@@ -520,7 +520,7 @@ Index: ffplay.c
if (vp->bmp) {
SDL_FreeYUVOverlay(vp->bmp);
vp->bmp = NULL;
-@@ -2498,6 +2785,9 @@
+@@ -2507,6 +2794,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" },
@@ -530,7 +530,7 @@ Index: ffplay.c
{ "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
{ NULL, },
};
-@@ -2546,7 +2836,9 @@
+@@ -2555,7 +2845,9 @@
avctx_opts[i]= avcodec_alloc_context2(i);
}
avformat_opts = av_alloc_format_context();
Modified: libavfilter/diffs/02_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/02_ffmpeg_filters.diff Mon Jan 12 00:23:20 2009 (r3949)
+++ libavfilter/diffs/02_ffmpeg_filters.diff Mon Jan 12 00:33:12 2009 (r3950)
@@ -1,6 +1,6 @@
Index: ffmpeg.c
===================================================================
---- ffmpeg.c (revision 16172)
+--- ffmpeg.c (revision 16562)
+++ ffmpeg.c (working copy)
@@ -41,6 +41,13 @@
#include "libavutil/avstring.h"
@@ -26,7 +26,7 @@ Index: ffmpeg.c
static int intra_only = 0;
static int audio_sample_rate = 44100;
-@@ -285,6 +295,13 @@
+@@ -286,6 +296,13 @@
is not defined */
int64_t pts; /* current pts */
int is_start; /* is 1 at the start and after a discontinuity */
@@ -40,7 +40,7 @@ Index: ffmpeg.c
} AVInputStream;
typedef struct AVInputFile {
-@@ -300,6 +317,174 @@
+@@ -301,6 +318,174 @@
static struct termios oldtty;
#endif
@@ -215,7 +215,7 @@ Index: ffmpeg.c
static void term_exit(void)
{
#ifdef HAVE_TERMIOS_H
-@@ -869,6 +1054,9 @@
+@@ -886,6 +1071,9 @@
if (nb_frames <= 0)
return;
@@ -225,7 +225,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) {
av_log(NULL, AV_LOG_ERROR, "error cropping picture\n");
-@@ -880,6 +1068,7 @@
+@@ -897,6 +1085,7 @@
} else {
formatted_picture = in_picture;
}
@@ -233,7 +233,7 @@ Index: ffmpeg.c
final_picture = formatted_picture;
padding_src = formatted_picture;
-@@ -897,12 +1086,14 @@
+@@ -914,12 +1103,14 @@
}
}
@@ -248,7 +248,7 @@ Index: ffmpeg.c
if (ost->video_pad) {
av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
-@@ -1173,6 +1364,7 @@
+@@ -1190,6 +1381,7 @@
static short *samples= NULL;
AVSubtitle subtitle, *subtitle_to_free;
int got_subtitle;
@@ -256,7 +256,7 @@ Index: ffmpeg.c
if(ist->next_pts == AV_NOPTS_VALUE)
ist->next_pts= ist->pts;
-@@ -1290,6 +1482,15 @@
+@@ -1307,6 +1499,15 @@
&buffer_to_free);
}
@@ -272,7 +272,7 @@ Index: ffmpeg.c
// preprocess audio (volume)
if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) {
if (audio_volume != 256) {
-@@ -1311,10 +1512,16 @@
+@@ -1328,10 +1529,16 @@
if (pts > now)
usleep(pts - now);
}
@@ -290,7 +290,7 @@ Index: ffmpeg.c
for(i=0;i<nb_ostreams;i++) {
int frame_size;
-@@ -1337,6 +1544,9 @@
+@@ -1354,6 +1561,9 @@
do_audio_out(os, ost, ist, data_buf, data_size);
break;
case CODEC_TYPE_VIDEO:
@@ -300,7 +300,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);
-@@ -1394,7 +1604,15 @@
+@@ -1411,7 +1621,15 @@
av_free_packet(&opkt);
}
}
@@ -316,7 +316,7 @@ Index: ffmpeg.c
av_free(buffer_to_free);
/* XXX: allocate the subtitles in the codec ? */
if (subtitle_to_free) {
-@@ -1814,10 +2032,21 @@
+@@ -1840,10 +2058,21 @@
fprintf(stderr, "Cannot get resampling context\n");
av_exit(1);
}
@@ -338,7 +338,7 @@ Index: ffmpeg.c
break;
case CODEC_TYPE_SUBTITLE:
ost->encoding_needed = 1;
-@@ -3804,6 +4033,9 @@
+@@ -3831,6 +4060,9 @@
#ifdef CONFIG_VHOOK
{ "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" },
#endif
More information about the FFmpeg-soc
mailing list