[FFmpeg-soc] [soc]: r5822 - in libavfilter: checkout.sh diffs/00_configure.diff diffs/03_libavfilter_doc.diff vf_overlay.c vf_setpts.c
stefano
subversion at mplayerhq.hu
Sat Jun 5 15:40:28 CEST 2010
Author: stefano
Date: Sat Jun 5 15:40:27 2010
New Revision: 5822
Log:
Update against FFmpeg r23486 / libswscale r31301.
Modified:
libavfilter/checkout.sh
libavfilter/diffs/00_configure.diff
libavfilter/diffs/03_libavfilter_doc.diff
libavfilter/vf_overlay.c
libavfilter/vf_setpts.c
Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh Fri Jun 4 22:15:35 2010 (r5821)
+++ libavfilter/checkout.sh Sat Jun 5 15:40:27 2010 (r5822)
@@ -1,11 +1,11 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r23145
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r23486
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
-svn up -r31170
+svn up -r31301
cd ../..
echo "patching ffmpeg"
Modified: libavfilter/diffs/00_configure.diff
==============================================================================
--- libavfilter/diffs/00_configure.diff Fri Jun 4 22:15:35 2010 (r5821)
+++ libavfilter/diffs/00_configure.diff Sat Jun 5 15:40:27 2010 (r5822)
@@ -1,6 +1,6 @@
Index: configure
===================================================================
---- configure (revision 23145)
+--- configure (revision 23486)
+++ configure (working copy)
@@ -172,6 +172,7 @@
--enable-libfaac enable FAAC support via libfaac [no]
@@ -10,7 +10,7 @@ Index: configure
--enable-libgsm enable GSM support via libgsm [no]
--enable-libmp3lame enable MP3 encoding via libmp3lame [no]
--enable-libnut enable NUT (de)muxing via libnut,
-@@ -916,6 +917,7 @@
+@@ -917,6 +918,7 @@
libfaac
libfaad
libfaadbin
@@ -18,7 +18,7 @@ Index: configure
libgsm
libmp3lame
libnut
-@@ -1056,6 +1058,7 @@
+@@ -1058,6 +1060,7 @@
llrintf
local_aligned_16
local_aligned_8
@@ -26,7 +26,7 @@ Index: configure
log2
log2f
loongson
-@@ -1413,6 +1416,7 @@
+@@ -1418,6 +1421,7 @@
udp_protocol_deps="network"
# filters
@@ -34,7 +34,7 @@ Index: configure
movie_filter_deps="avfilter_lavf"
avfilter_lavf_deps="avformat"
-@@ -2523,6 +2527,7 @@
+@@ -2529,6 +2533,7 @@
check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
check_func inet_aton $network_extralibs
check_func isatty
@@ -42,7 +42,7 @@ Index: configure
check_func ${malloc_prefix}memalign && enable memalign
check_func mkstemp
check_func ${malloc_prefix}posix_memalign && enable posix_memalign
-@@ -2605,6 +2610,7 @@
+@@ -2611,6 +2616,7 @@
require libdirac libdirac_encoder/dirac_encoder.h dirac_encoder_init $(pkg-config --libs dirac)
enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
enabled libfaad && require2 libfaad faad.h faacDecOpen -lfaad
Modified: libavfilter/diffs/03_libavfilter_doc.diff
==============================================================================
--- libavfilter/diffs/03_libavfilter_doc.diff Fri Jun 4 22:15:35 2010 (r5821)
+++ libavfilter/diffs/03_libavfilter_doc.diff Sat Jun 5 15:40:27 2010 (r5822)
@@ -1,6 +1,6 @@
Index: doc/libavfilter.texi
===================================================================
---- doc/libavfilter.texi (revision 23145)
+--- doc/libavfilter.texi (revision 23486)
+++ doc/libavfilter.texi (working copy)
@@ -139,6 +139,111 @@
Modified: libavfilter/vf_overlay.c
==============================================================================
--- libavfilter/vf_overlay.c Fri Jun 4 22:15:35 2010 (r5821)
+++ libavfilter/vf_overlay.c Sat Jun 5 15:40:27 2010 (r5822)
@@ -25,7 +25,7 @@
*/
#include "avfilter.h"
-#include "libavcodec/eval.h"
+#include "libavutil/eval.h"
#include "libavutil/avstring.h"
static const char *var_names[] = {
@@ -126,8 +126,9 @@ static int config_input_overlay(AVFilter
{
AVFilterContext *ctx = link->dst;
OverlayContext *over = link->dst->priv;
- const char *error = NULL, *expr;
- double var_values[VARS_NB], ret;
+ const char *expr;
+ double var_values[VARS_NB], res;
+ int ret;
/* Finish the configuration by evaluating the expressions
now when both inputs are configured. */
@@ -139,16 +140,16 @@ static int config_input_overlay(AVFilter
av_log(ctx, AV_LOG_INFO, "main %dx%d overlay %dx%d\n", ctx->inputs[0]->w, ctx->inputs[0]->h,
ctx->inputs[1]->w, ctx->inputs[1]->h);
- if (ff_parse_and_eval_expr(&ret, (expr = over->x_expr),
+ if ((ret = av_parse_and_eval_expr(&res, (expr = over->x_expr),
var_names, var_values,
NULL, NULL, NULL, NULL,
- NULL, 0, ctx) < 0)
+ NULL, 0, ctx)) < 0)
goto fail;
over->x = ret;
- if (ff_parse_and_eval_expr(&ret, (expr = over->y_expr),
+ if ((ret = av_parse_and_eval_expr(&res, (expr = over->y_expr),
var_names, var_values,
NULL, NULL, NULL, NULL,
- NULL, 0, ctx) < 0)
+ NULL, 0, ctx)) < 0)
goto fail;
over->y = ret;
@@ -161,8 +162,8 @@ static int config_input_overlay(AVFilter
fail:
av_log(NULL, AV_LOG_ERROR,
- "Error when evaluating the expression '%s': %s\n", expr, error);
- return -1;
+ "Error when evaluating the expression '%s'\n", expr);
+ return ret;
}
static AVFilterPicRef *get_video_buffer(AVFilterLink *link, int perms, int w, int h)
Modified: libavfilter/vf_setpts.c
==============================================================================
--- libavfilter/vf_setpts.c Fri Jun 4 22:15:35 2010 (r5821)
+++ libavfilter/vf_setpts.c Sat Jun 5 15:40:27 2010 (r5822)
@@ -36,7 +36,7 @@
ffmpeg -i input.avi -vfilters 'setpts=AVTB/25*(N+0.05*sin(N*2*PI/25))' output.avi
*/
-#include "libavcodec/eval.h"
+#include "libavutil/eval.h"
#include "avfilter.h"
@@ -70,13 +70,15 @@ typedef struct {
static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
{
SetPTSContext *setpts = ctx->priv;
- const char *error;
+ int ret;
- setpts->expr = ff_parse_expr(args ? args : "PTS",
- const_names, NULL, NULL, NULL, NULL, &error);
- if (! setpts->expr)
+ ret = av_parse_expr(&setpts->expr, args ? args : "PTS",
+ const_names, NULL, NULL, NULL, NULL, 0, ctx);
+ if (ret < 0) {
av_log(ctx, AV_LOG_ERROR,
- "init() cannot parse expresion '%s' due to %s\n", args, error);
+ "Error while parsing expression '%s'\n", args);
+ return ret;
+ }
setpts->const_values[POV_PI ] = M_PI;
setpts->const_values[POV_E ] = M_E;
@@ -108,7 +110,7 @@ static void start_frame(AVFilterLink *li
// (uint64_t) ff_parse_eval(setpts->expr, setpts->const_values, setpts));
ref2->pts =
- (uint64_t) ff_eval_expr(setpts->expr, setpts->const_values, setpts);
+ (uint64_t) av_eval_expr(setpts->expr, setpts->const_values, setpts);
setpts->const_values[POV_N ] += 1.0;
@@ -118,7 +120,7 @@ static void start_frame(AVFilterLink *li
static av_cold void uninit(AVFilterContext *ctx)
{
SetPTSContext *setpts = ctx->priv;
- ff_free_expr(setpts->expr);
+ av_free_expr(setpts->expr);
}
AVFilter avfilter_vf_setpts =
More information about the FFmpeg-soc
mailing list