Author: vitor
Date: Mon Jun 16 23:06:59 2008
New Revision: 2465
Log:
Sync with svn
Added:
libavfilter/graphparser.c.2081
- copied unchanged from r2081, /libavfilter/graphparser.c
libavfilter/graphparser.c.2090
- copied unchanged from r2090, /libavfilter/graphparser.c
libavfilter/graphparser.c.2093
- copied unchanged from r2093, /libavfilter/graphparser.c
libavfilter/graphparser.c.2094
- copied unchanged from r2094, /libavfilter/graphparser.c
libavfilter/graphparser.c.2095
- copied unchanged from r2095, /libavfilter/graphparser.c
libavfilter/graphparser.c.2096
- copied unchanged from r2096, /libavfilter/graphparser.c
libavfilter/graphparser.c.2097
- copied unchanged from r2097, /libavfilter/graphparser.c
libavfilter/graphparser.c.2098
- copied unchanged from r2098, /libavfilter/graphparser.c
libavfilter/graphparser.c.2099
- copied unchanged from r2099, /libavfilter/graphparser.c
libavfilter/graphparser.c.2100
- copied unchanged from r2100, /libavfilter/graphparser.c
libavfilter/graphparser.c.2101
- copied unchanged from r2101, /libavfilter/graphparser.c
libavfilter/graphparser.c.2102
- copied unchanged from r2102, /libavfilter/graphparser.c
libavfilter/graphparser.c.2110
- copied unchanged from r2110, /libavfilter/graphparser.c
libavfilter/graphparser.c.2111
- copied unchanged from r2111, /libavfilter/graphparser.c
libavfilter/graphparser.c.2112
- copied unchanged from r2112, /libavfilter/graphparser.c
libavfilter/graphparser.c.2113
- copied unchanged from r2113, /libavfilter/graphparser.c
libavfilter/graphparser.c.2114
- copied unchanged from r2114, /libavfilter/graphparser.c
libavfilter/graphparser.c.2115
- copied unchanged from r2115, /libavfilter/graphparser.c
libavfilter/graphparser.c.2116
- copied unchanged from r2116, /libavfilter/graphparser.c
libavfilter/graphparser.c.2118
- copied unchanged from r2118, /libavfilter/graphparser.c
libavfilter/graphparser.c.2119
- copied unchanged from r2119, /libavfilter/graphparser.c
libavfilter/graphparser.c.2120
- copied unchanged from r2120, /libavfilter/graphparser.c
libavfilter/graphparser.c.2121
- copied unchanged from r2121, /libavfilter/graphparser.c
libavfilter/graphparser.c.2122
- copied unchanged from r2122, /libavfilter/graphparser.c
libavfilter/graphparser.c.2123
- copied unchanged from r2123, /libavfilter/graphparser.c
libavfilter/graphparser.c.2124
- copied unchanged from r2124, /libavfilter/graphparser.c
libavfilter/graphparser.c.2125
- copied unchanged from r2125, /libavfilter/graphparser.c
libavfilter/graphparser.c.2126
- copied unchanged from r2126, /libavfilter/graphparser.c
libavfilter/graphparser.c.2127
- copied unchanged from r2127, /libavfilter/graphparser.c
libavfilter/graphparser.c.2128
- copied unchanged from r2128, /libavfilter/graphparser.c
libavfilter/graphparser.c.2129
- copied unchanged from r2129, /libavfilter/graphparser.c
libavfilter/graphparser.c.2130
- copied unchanged from r2130, /libavfilter/graphparser.c
libavfilter/graphparser.c.2131
- copied unchanged from r2131, /libavfilter/graphparser.c
libavfilter/graphparser.c.2132
- copied unchanged from r2132, /libavfilter/graphparser.c
libavfilter/graphparser.c.2134
- copied unchanged from r2134, /libavfilter/graphparser.c
libavfilter/graphparser.c.2135
- copied unchanged from r2135, /libavfilter/graphparser.c
libavfilter/graphparser.c.2136
- copied unchanged from r2136, /libavfilter/graphparser.c
libavfilter/graphparser.c.2137
- copied unchanged from r2137, /libavfilter/graphparser.c
libavfilter/graphparser.c.2149
- copied unchanged from r2149, /libavfilter/graphparser.c
libavfilter/graphparser.c.2150
- copied unchanged from r2150, /libavfilter/graphparser.c
libavfilter/graphparser.c.2151
- copied unchanged from r2151, /libavfilter/graphparser.c
libavfilter/graphparser.c.2152
- copied unchanged from r2152, /libavfilter/graphparser.c
libavfilter/graphparser.c.2153
- copied unchanged from r2153, /libavfilter/graphparser.c
libavfilter/graphparser.c.2154
- copied unchanged from r2154, /libavfilter/graphparser.c
libavfilter/graphparser.c.2155
- copied unchanged from r2155, /libavfilter/graphparser.c
libavfilter/graphparser.c.2156
- copied unchanged from r2156, /libavfilter/graphparser.c
libavfilter/graphparser.c.2157
- copied unchanged from r2157, /libavfilter/graphparser.c
libavfilter/graphparser.c.2158
- copied unchanged from r2158, /libavfilter/graphparser.c
libavfilter/graphparser.c.2159
- copied unchanged from r2159, /libavfilter/graphparser.c
libavfilter/graphparser.c.2160
- copied unchanged from r2160, /libavfilter/graphparser.c
libavfilter/graphparser.c.2161
- copied unchanged from r2161, /libavfilter/graphparser.c
libavfilter/graphparser.c.2162
- copied unchanged from r2162, /libavfilter/graphparser.c
libavfilter/graphparser.c.2163
- copied unchanged from r2163, /libavfilter/graphparser.c
libavfilter/graphparser.c.2164
- copied unchanged from r2164, /libavfilter/graphparser.c
libavfilter/graphparser.c.2186
- copied unchanged from r2186, /libavfilter/graphparser.c
libavfilter/graphparser.c.2187
- copied unchanged from r2187, /libavfilter/graphparser.c
libavfilter/graphparser.c.2188
- copied unchanged from r2188, /libavfilter/graphparser.c
libavfilter/graphparser.c.2189
- copied unchanged from r2189, /libavfilter/graphparser.c
libavfilter/graphparser.c.2190
- copied unchanged from r2190, /libavfilter/graphparser.c
libavfilter/graphparser.c.2191
- copied unchanged from r2191, /libavfilter/graphparser.c
libavfilter/graphparser.c.2192
- copied unchanged from r2192, /libavfilter/graphparser.c
libavfilter/graphparser.c.2193
- copied unchanged from r2193, /libavfilter/graphparser.c
libavfilter/graphparser.c.2194
- copied unchanged from r2194, /libavfilter/graphparser.c
libavfilter/graphparser.c.2195
- copied unchanged from r2195, /libavfilter/graphparser.c
libavfilter/graphparser.c.2196
- copied unchanged from r2196, /libavfilter/graphparser.c
libavfilter/graphparser.c.2197
- copied unchanged from r2197, /libavfilter/graphparser.c
libavfilter/graphparser.c.2198
- copied unchanged from r2198, /libavfilter/graphparser.c
libavfilter/graphparser.c.2199
- copied unchanged from r2199, /libavfilter/graphparser.c
libavfilter/graphparser.c.2200
- copied unchanged from r2200, /libavfilter/graphparser.c
libavfilter/graphparser.c.2201
- copied unchanged from r2201, /libavfilter/graphparser.c
libavfilter/graphparser.c.2202
- copied unchanged from r2202, /libavfilter/graphparser.c
libavfilter/graphparser.c.2203
- copied unchanged from r2203, /libavfilter/graphparser.c
libavfilter/graphparser.c.2204
- copied unchanged from r2204, /libavfilter/graphparser.c
libavfilter/graphparser.c.2205
- copied unchanged from r2205, /libavfilter/graphparser.c
libavfilter/graphparser.c.2206
- copied unchanged from r2206, /libavfilter/graphparser.c
libavfilter/graphparser.h.2081
- copied unchanged from r2081, /libavfilter/graphparser.h
libavfilter/graphparser.h.2090
- copied unchanged from r2090, /libavfilter/graphparser.h
libavfilter/graphparser.h.2093
- copied unchanged from r2093, /libavfilter/graphparser.h
libavfilter/graphparser.h.2094
- copied unchanged from r2094, /libavfilter/graphparser.h
libavfilter/graphparser.h.2095
- copied unchanged from r2095, /libavfilter/graphparser.h
libavfilter/graphparser.h.2096
- copied unchanged from r2096, /libavfilter/graphparser.h
libavfilter/graphparser.h.2097
- copied unchanged from r2097, /libavfilter/graphparser.h
libavfilter/graphparser.h.2098
- copied unchanged from r2098, /libavfilter/graphparser.h
libavfilter/graphparser.h.2099
- copied unchanged from r2099, /libavfilter/graphparser.h
libavfilter/graphparser.h.2100
- copied unchanged from r2100, /libavfilter/graphparser.h
libavfilter/graphparser.h.2101
- copied unchanged from r2101, /libavfilter/graphparser.h
libavfilter/graphparser.h.2102
- copied unchanged from r2102, /libavfilter/graphparser.h
libavfilter/graphparser.h.2110
- copied unchanged from r2110, /libavfilter/graphparser.h
libavfilter/graphparser.h.2111
- copied unchanged from r2111, /libavfilter/graphparser.h
libavfilter/graphparser.h.2112
- copied unchanged from r2112, /libavfilter/graphparser.h
libavfilter/graphparser.h.2113
- copied unchanged from r2113, /libavfilter/graphparser.h
libavfilter/graphparser.h.2114
- copied unchanged from r2114, /libavfilter/graphparser.h
libavfilter/graphparser.h.2115
- copied unchanged from r2115, /libavfilter/graphparser.h
libavfilter/graphparser.h.2116
- copied unchanged from r2116, /libavfilter/graphparser.h
libavfilter/graphparser.h.2117
- copied unchanged from r2117, /libavfilter/graphparser.h
libavfilter/graphparser.h.2118
- copied unchanged from r2118, /libavfilter/graphparser.h
libavfilter/graphparser.h.2119
- copied unchanged from r2119, /libavfilter/graphparser.h
libavfilter/graphparser.h.2120
- copied unchanged from r2120, /libavfilter/graphparser.h
libavfilter/graphparser.h.2121
- copied unchanged from r2121, /libavfilter/graphparser.h
libavfilter/graphparser.h.2122
- copied unchanged from r2122, /libavfilter/graphparser.h
libavfilter/graphparser.h.2123
- copied unchanged from r2123, /libavfilter/graphparser.h
libavfilter/graphparser.h.2124
- copied unchanged from r2124, /libavfilter/graphparser.h
libavfilter/graphparser.h.2125
- copied unchanged from r2125, /libavfilter/graphparser.h
libavfilter/graphparser.h.2126
- copied unchanged from r2126, /libavfilter/graphparser.h
libavfilter/graphparser.h.2127
- copied unchanged from r2127, /libavfilter/graphparser.h
libavfilter/graphparser.h.2128
- copied unchanged from r2128, /libavfilter/graphparser.h
libavfilter/graphparser.h.2129
- copied unchanged from r2129, /libavfilter/graphparser.h
libavfilter/graphparser.h.2130
- copied unchanged from r2130, /libavfilter/graphparser.h
libavfilter/graphparser.h.2131
- copied unchanged from r2131, /libavfilter/graphparser.h
libavfilter/graphparser.h.2132
- copied unchanged from r2132, /libavfilter/graphparser.h
libavfilter/graphparser.h.2134
- copied unchanged from r2134, /libavfilter/graphparser.h
libavfilter/graphparser.h.2135
- copied unchanged from r2135, /libavfilter/graphparser.h
libavfilter/graphparser.h.2136
- copied unchanged from r2136, /libavfilter/graphparser.h
libavfilter/graphparser.h.2137
- copied unchanged from r2137, /libavfilter/graphparser.h
libavfilter/graphparser.h.2149
- copied unchanged from r2149, /libavfilter/graphparser.h
libavfilter/graphparser.h.2150
- copied unchanged from r2150, /libavfilter/graphparser.h
libavfilter/graphparser.h.2151
- copied unchanged from r2151, /libavfilter/graphparser.h
libavfilter/graphparser.h.2152
- copied unchanged from r2152, /libavfilter/graphparser.h
libavfilter/graphparser.h.2153
- copied unchanged from r2153, /libavfilter/graphparser.h
libavfilter/graphparser.h.2154
- copied unchanged from r2154, /libavfilter/graphparser.h
libavfilter/graphparser.h.2155
- copied unchanged from r2155, /libavfilter/graphparser.h
libavfilter/graphparser.h.2156
- copied unchanged from r2156, /libavfilter/graphparser.h
libavfilter/graphparser.h.2157
- copied unchanged from r2157, /libavfilter/graphparser.h
libavfilter/graphparser.h.2158
- copied unchanged from r2158, /libavfilter/graphparser.h
libavfilter/graphparser.h.2159
- copied unchanged from r2159, /libavfilter/graphparser.h
libavfilter/graphparser.h.2160
- copied unchanged from r2160, /libavfilter/graphparser.h
libavfilter/graphparser.h.2161
- copied unchanged from r2161, /libavfilter/graphparser.h
libavfilter/graphparser.h.2162
- copied unchanged from r2162, /libavfilter/graphparser.h
libavfilter/graphparser.h.2163
- copied unchanged from r2163, /libavfilter/graphparser.h
libavfilter/graphparser.h.2164
- copied unchanged from r2164, /libavfilter/graphparser.h
libavfilter/graphparser.h.2186
- copied unchanged from r2186, /libavfilter/graphparser.h
libavfilter/graphparser.h.2187
- copied unchanged from r2187, /libavfilter/graphparser.h
libavfilter/graphparser.h.2188
- copied unchanged from r2188, /libavfilter/graphparser.h
libavfilter/graphparser.h.2189
- copied unchanged from r2189, /libavfilter/graphparser.h
libavfilter/graphparser.h.2190
- copied unchanged from r2190, /libavfilter/graphparser.h
libavfilter/graphparser.h.2191
- copied unchanged from r2191, /libavfilter/graphparser.h
libavfilter/graphparser.h.2192
- copied unchanged from r2192, /libavfilter/graphparser.h
libavfilter/graphparser.h.2193
- copied unchanged from r2193, /libavfilter/graphparser.h
libavfilter/graphparser.h.2194
- copied unchanged from r2194, /libavfilter/graphparser.h
libavfilter/graphparser.h.2195
- copied unchanged from r2195, /libavfilter/graphparser.h
libavfilter/graphparser.h.2196
- copied unchanged from r2196, /libavfilter/graphparser.h
libavfilter/graphparser.h.2197
- copied unchanged from r2197, /libavfilter/graphparser.h
libavfilter/graphparser.h.2198
- copied unchanged from r2198, /libavfilter/graphparser.h
libavfilter/graphparser.h.2199
- copied unchanged from r2199, /libavfilter/graphparser.h
libavfilter/graphparser.h.2200
- copied unchanged from r2200, /libavfilter/graphparser.h
libavfilter/graphparser.h.2201
- copied unchanged from r2201, /libavfilter/graphparser.h
libavfilter/graphparser.h.2202
- copied unchanged from r2202, /libavfilter/graphparser.h
libavfilter/graphparser.h.2203
- copied unchanged from r2203, /libavfilter/graphparser.h
libavfilter/graphparser.h.2204
- copied unchanged from r2204, /libavfilter/graphparser.h
libavfilter/graphparser.h.2205
- copied unchanged from r2205, /libavfilter/graphparser.h
libavfilter/graphparser.h.2206
- copied unchanged from r2206, /libavfilter/graphparser.h
Modified:
libavfilter/diffs/04_ffmpeg_filters.diff
Modified: libavfilter/diffs/04_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/04_ffmpeg_filters.diff (original)
+++ libavfilter/diffs/04_ffmpeg_filters.diff Mon Jun 16 23:06:59 2008
@@ -1,10 +1,10 @@
Index: ffmpeg.c
===================================================================
---- ffmpeg.c (revision 12891)
+--- ffmpeg.c (revision 13595)
+++ ffmpeg.c (working copy)
@@ -36,6 +36,12 @@
- #include "avstring.h"
- #include "os_support.h"
+ #include "libavutil/avstring.h"
+ #include "libavformat/os_support.h"
+#if ENABLE_AVFILTER
+# include "avfilter.h"
@@ -12,10 +12,10 @@ Index: ffmpeg.c
+# include "graphparser.h"
+#endif
+
- #if !defined(HAVE_GETRUSAGE) && defined(HAVE_GETPROCESSTIMES)
- #include <windows.h>
- #endif
-@@ -135,6 +141,9 @@
+ #ifdef HAVE_SYS_RESOURCE_H
+ #include <sys/types.h>
+ #include <sys/resource.h>
+@@ -136,6 +142,9 @@
static int loop_input = 0;
static int loop_output = AVFMT_NOOUTPUTLOOP;
static int qp_hist = 0;
@@ -25,7 +25,7 @@ Index: ffmpeg.c
static int intra_only = 0;
static int audio_sample_rate = 44100;
-@@ -273,6 +282,13 @@
+@@ -274,6 +283,13 @@
is not defined */
int64_t pts; /* current pts */
int is_start; /* is 1 at the start and after a discontinuity */
@@ -39,7 +39,7 @@ Index: ffmpeg.c
} AVInputStream;
typedef struct AVInputFile {
-@@ -288,6 +304,266 @@
+@@ -289,6 +305,266 @@
static struct termios oldtty;
#endif
@@ -306,7 +306,7 @@ Index: ffmpeg.c
static void term_exit(void)
{
#ifdef HAVE_TERMIOS_H
-@@ -807,6 +1083,9 @@
+@@ -808,6 +1084,9 @@
if (nb_frames <= 0)
return;
@@ -316,7 +316,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");
-@@ -816,6 +1095,7 @@
+@@ -817,6 +1096,7 @@
} else {
formatted_picture = in_picture;
}
@@ -324,7 +324,7 @@ Index: ffmpeg.c
final_picture = formatted_picture;
padding_src = formatted_picture;
-@@ -831,12 +1111,14 @@
+@@ -832,12 +1112,14 @@
}
}
@@ -339,7 +339,7 @@ Index: ffmpeg.c
if (ost->video_pad) {
av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
-@@ -1106,6 +1388,7 @@
+@@ -1107,6 +1389,7 @@
static short *samples= NULL;
AVSubtitle subtitle, *subtitle_to_free;
int got_subtitle;
@@ -347,7 +347,7 @@ Index: ffmpeg.c
if(ist->next_pts == AV_NOPTS_VALUE)
ist->next_pts= ist->pts;
-@@ -1218,6 +1501,17 @@
+@@ -1219,6 +1502,17 @@
&buffer_to_free);
}
@@ -365,7 +365,7 @@ Index: ffmpeg.c
// preprocess audio (volume)
if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) {
if (audio_volume != 256) {
-@@ -1255,9 +1549,16 @@
+@@ -1256,9 +1550,16 @@
}
}
#endif
@@ -382,7 +382,7 @@ Index: ffmpeg.c
for(i=0;i<nb_ostreams;i++) {
int frame_size;
-@@ -1280,6 +1581,9 @@
+@@ -1281,6 +1582,9 @@
do_audio_out(os, ost, ist, data_buf, data_size);
break;
case CODEC_TYPE_VIDEO:
@@ -392,7 +392,7 @@ Index: ffmpeg.c
do_video_out(os, ost, ist, &picture, &frame_size);
video_size += frame_size;
if (vstats_filename && frame_size)
-@@ -1338,7 +1642,15 @@
+@@ -1339,7 +1643,15 @@
av_free_packet(&opkt);
}
}
@@ -408,7 +408,7 @@ Index: ffmpeg.c
av_free(buffer_to_free);
/* XXX: allocate the subtitles in the codec ? */
if (subtitle_to_free) {
-@@ -1746,10 +2058,21 @@
+@@ -1748,10 +2060,21 @@
fprintf(stderr, "Cannot get resampling context\n");
av_exit(1);
}
@@ -430,7 +430,7 @@ Index: ffmpeg.c
break;
case CODEC_TYPE_SUBTITLE:
ost->encoding_needed = 1;
-@@ -3850,6 +4173,9 @@
+@@ -3718,6 +4041,9 @@
#ifdef CONFIG_VHOOK
{ "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker},
"insert video processing module", "module" },
#endif
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
