[FFmpeg-soc] [soc]: r4053 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff
stefano
subversion at mplayerhq.hu
Sat Feb 14 13:02:21 CET 2009
Author: stefano
Date: Sat Feb 14 13:02:20 2009
New Revision: 4053
Log:
Update to FFmpeg SVN r17222.
Modified:
libavfilter/checkout.sh
libavfilter/diffs/01_ffplay_filters.diff
libavfilter/diffs/02_ffmpeg_filters.diff
Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh Fri Feb 13 02:23:03 2009 (r4052)
+++ libavfilter/checkout.sh Sat Feb 14 13:02:20 2009 (r4053)
@@ -1,7 +1,7 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r16809
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r17222
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 Fri Feb 13 02:23:03 2009 (r4052)
+++ libavfilter/diffs/01_ffplay_filters.diff Sat Feb 14 13:02:20 2009 (r4053)
@@ -1,6 +1,6 @@
Index: ffplay.c
===================================================================
---- ffplay.c (revision 16809)
+--- ffplay.c (revision 17222)
+++ ffplay.c (working copy)
@@ -29,6 +29,12 @@
#include "libavcodec/audioconvert.h"
@@ -49,7 +49,7 @@ Index: ffplay.c
} VideoState;
static void show_help(void);
-@@ -211,6 +228,9 @@
+@@ -212,6 +229,9 @@
static int error_recognition = FF_ER_CAREFUL;
static int error_concealment = 3;
static int decoder_reorder_pts= 0;
@@ -59,7 +59,7 @@ Index: ffplay.c
/* current context */
static int is_full_screen;
-@@ -658,6 +678,13 @@
+@@ -661,6 +681,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);
-@@ -665,9 +692,10 @@
+@@ -668,9 +695,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
-@@ -870,9 +898,15 @@
+@@ -873,9 +901,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;
-@@ -1177,6 +1211,20 @@
+@@ -1180,6 +1214,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 */
-@@ -1194,12 +1242,9 @@
+@@ -1197,12 +1245,9 @@
break;
}
#endif
@@ -136,7 +136,7 @@ Index: ffplay.c
SDL_LockMutex(is->pictq_mutex);
vp->allocated = 1;
-@@ -1216,8 +1261,11 @@
+@@ -1219,8 +1264,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 &&
-@@ -1233,8 +1281,13 @@
+@@ -1236,8 +1284,13 @@
/* alloc or resize hardware picture buffer */
if (!vp->bmp ||
@@ -163,7 +163,7 @@ Index: ffplay.c
SDL_Event event;
vp->allocated = 0;
-@@ -1258,6 +1311,12 @@
+@@ -1261,6 +1314,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);
-@@ -1269,18 +1328,30 @@
+@@ -1272,18 +1331,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);
-@@ -1335,54 +1406,266 @@
+@@ -1338,54 +1409,266 @@
return queue_picture(is, src_frame, pts);
}
@@ -509,7 +509,7 @@ Index: ffplay.c
av_free(frame);
return 0;
}
-@@ -2168,6 +2451,12 @@
+@@ -2181,6 +2464,12 @@
/* free all pictures */
for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
vp = &is->pictq[i];
@@ -522,7 +522,7 @@ Index: ffplay.c
if (vp->bmp) {
SDL_FreeYUVOverlay(vp->bmp);
vp->bmp = NULL;
-@@ -2505,6 +2794,9 @@
+@@ -2519,6 +2808,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" },
@@ -532,10 +532,10 @@ Index: ffplay.c
{ "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
{ NULL, },
};
-@@ -2553,7 +2845,9 @@
+@@ -2567,7 +2859,9 @@
avctx_opts[i]= avcodec_alloc_context2(i);
}
- avformat_opts = av_alloc_format_context();
+ avformat_opts = avformat_alloc_context();
+#if !CONFIG_AVFILTER
sws_opts = sws_getContext(16,16,0, 16,16,0, sws_flags, NULL,NULL,NULL);
+#endif
Modified: libavfilter/diffs/02_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/02_ffmpeg_filters.diff Fri Feb 13 02:23:03 2009 (r4052)
+++ libavfilter/diffs/02_ffmpeg_filters.diff Sat Feb 14 13:02:20 2009 (r4053)
@@ -1,6 +1,6 @@
Index: ffmpeg.c
===================================================================
---- ffmpeg.c (revision 16809)
+--- ffmpeg.c (revision 17222)
+++ ffmpeg.c (working copy)
@@ -41,6 +41,13 @@
#include "libavutil/avstring.h"
@@ -296,7 +296,7 @@ Index: ffmpeg.c
for(i=0;i<nb_ostreams;i++) {
int frame_size;
-@@ -1354,6 +1563,9 @@
+@@ -1354,6 +1567,9 @@
do_audio_out(os, ost, ist, data_buf, data_size);
break;
case CODEC_TYPE_VIDEO:
@@ -324,7 +324,7 @@ Index: ffmpeg.c
av_free(buffer_to_free);
/* XXX: allocate the subtitles in the codec ? */
if (subtitle_to_free) {
-@@ -1842,10 +2062,21 @@
+@@ -1842,10 +2068,21 @@
fprintf(stderr, "Cannot get resampling context\n");
av_exit(1);
}
@@ -346,7 +346,7 @@ Index: ffmpeg.c
break;
case CODEC_TYPE_SUBTITLE:
ost->encoding_needed = 1;
-@@ -3835,6 +4066,9 @@
+@@ -3835,6 +4072,9 @@
#if 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