November 2010 - ffmpeg-cvslog

r18533 - trunk/libavcodec/h264.c
by subversion＠mplayerhq.hu 10 Jan '11

10 Jan '11

Author: michael Date: Thu Apr 16 06:46:44 2009 New Revision: 18533 Log: Support broken avc nal encapsulation. Fixes issue987. Modified: trunk/libavcodec/h264.c Modified: trunk/libavcodec/h264.c ============================================================================== --- trunk/libavcodec/h264.c Thu Apr 16 04:28:49 2009 (r18532) +++ trunk/libavcodec/h264.c Thu Apr 16 06:46:44 2009 (r18533) @@ -7461,6 +7461,7 @@ static int decode_nal_units(H264Context int buf_index=0; H264Context *hx; ///< thread context int context_count = 0; + int next_avc= h->is_avc ? 0 : buf_size; h->max_contexts = avctx->thread_count; #if 0 @@ -7484,7 +7485,7 @@ static int decode_nal_units(H264Context int i, nalsize = 0; int err; - if(h->is_avc) { + if(buf_index >= next_avc) { if(buf_index >= buf_size) break; nalsize = 0; for(i = 0; i < h->nal_length_size; i++) @@ -7498,6 +7499,7 @@ static int decode_nal_units(H264Context break; } } + next_avc= buf_index + nalsize; } else { // start code prefix search for(; buf_index + 3 < buf_size; buf_index++){ @@ -7513,7 +7515,7 @@ static int decode_nal_units(H264Context hx = h->thread_context[context_count]; - ptr= ff_h264_decode_nal(hx, buf + buf_index, &dst_length, &consumed, h->is_avc ? nalsize : buf_size - buf_index); + ptr= ff_h264_decode_nal(hx, buf + buf_index, &dst_length, &consumed, next_avc - buf_index); if (ptr==NULL || dst_length < 0){ return -1; } @@ -7525,13 +7527,12 @@ static int decode_nal_units(H264Context av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d at %d/%d length %d\n", hx->nal_unit_type, buf_index, buf_size, dst_length); } - if (h->is_avc && (nalsize != consumed)){ + if (h->is_avc && (nalsize != consumed) && nalsize){ int i, debug_level = AV_LOG_DEBUG; for (i = consumed; i < nalsize; i++) if (buf[buf_index+i]) debug_level = AV_LOG_ERROR; av_log(h->s.avctx, debug_level, "AVC: Consumed only %d bytes instead of %d\n", consumed, nalsize); - consumed= nalsize; } buf_index += consumed;

3 7

r24645 - in trunk: Makefile tests/lavfi-regression.sh
by subversion＠mplayerhq.hu 29 Dec '10

29 Dec '10

Author: stefano Date: Sun Aug 1 12:27:04 2010 New Revision: 24645 Log: Fix fate-lavfi-pixfmts test cross-compilation. Add the lavfi-showfiltfmts dependency in the Makefile, and correctly use the $target_exec and $target_path variables for invoking the lavfi-showfiltfmts tool. Modified: trunk/Makefile trunk/tests/lavfi-regression.sh Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sun Aug 1 12:27:00 2010 (r24644) +++ trunk/Makefile Sun Aug 1 12:27:04 2010 (r24645) @@ -226,6 +226,9 @@ tests/data/asynth1.sw tests/vsynth%/00.p tests/seek_test$(EXESUF): tests/seek_test.o $(FF_DEP_LIBS) $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) +tools/lavfi-showfiltfmts$(EXESUF): tools/lavfi-showfiltfmts.o $(FF_DEP_LIBS) + $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) + include $(SRC_PATH_BARE)/tests/fate.mak include $(SRC_PATH_BARE)/tests/fate2.mak @@ -248,7 +251,7 @@ FATE = $(FATE_ACODEC) $(FATE_ACODEC): $(AREF) $(FATE_VCODEC): $(VREF) $(FATE_LAVF): $(REFS) -$(FATE_LAVFI): $(REFS) +$(FATE_LAVFI): $(REFS) tools/lavfi-showfiltfmts$(EXESUF) $(FATE_SEEK): fate-codec fate-lavf tests/seek_test$(EXESUF) $(FATE_ACODEC): CMD = codectest acodec Modified: trunk/tests/lavfi-regression.sh ============================================================================== --- trunk/tests/lavfi-regression.sh Sun Aug 1 12:27:00 2010 (r24644) +++ trunk/tests/lavfi-regression.sh Sun Aug 1 12:27:04 2010 (r24645) @@ -66,15 +66,16 @@ vflip " if [ -n "$do_pixfmts_be" ] || [ -n "$do_pixfmts_le" ]; then + showfiltfmts="$target_exec $target_path/tools/lavfi-showfiltfmts" # exclude pixel formats which are not supported as input excluded_pix_fmts="$($ffmpeg -pix_fmts list 2>/dev/null | sed -ne '9,$p' | grep '^\..\.' | cut -d' ' -f2)" - scale_out_pix_fmts=$(tools/lavfi-showfiltfmts scale | grep "^OUTPUT" | cut -d: -f2) + scale_out_pix_fmts=$($showfiltfmts scale | grep "^OUTPUT" | cut -d: -f2) scale_out_pix_fmts=$(get_exclusive_elements "$scale_out_pix_fmts" "$excluded_pix_fmts") for filter_args in $filters_args; do filter=$(echo $filter_args | sed -e 's/$[^=]\+$=.*/\1/') - in_pix_fmts=$(tools/lavfi-showfiltfmts $filter | grep "^INPUT" | cut -d: -f2) + in_pix_fmts=$($showfiltfmts $filter | grep "^INPUT" | cut -d: -f2) pix_fmts=$(get_common_elements "$in_pix_fmts" "$scale_out_pix_fmts") for pix_fmt in $pix_fmts; do

3 2

r15641 - trunk/libavformat/utils.c
by subversion＠mplayerhq.hu 23 Dec '10

23 Dec '10

Author: michael Date: Sun Oct 19 03:02:48 2008 New Revision: 15641 Log: Check for pts==dts on I/P frames in the presence of non low delay decoding and discard these invalid timestamps. fixes issue171. Modified: trunk/libavformat/utils.c Modified: trunk/libavformat/utils.c ============================================================================== --- trunk/libavformat/utils.c (original) +++ trunk/libavformat/utils.c Sun Oct 19 03:02:48 2008 @@ -838,6 +838,14 @@ static void compute_pkt_fields(AVFormatC pkt->dts -= 1LL<<st->pts_wrap_bits; } + // some mpeg2 in mpeg-ps lack dts (issue171 / input_file.mpg) + // we take the conservative approach and discard both + // Note, if this is misbehaving for a H.264 file then possibly presentation_delayed is not set correctly. + if(delay==1 && pkt->dts == pkt->pts && pkt->dts != AV_NOPTS_VALUE && presentation_delayed){ + av_log(s, AV_LOG_ERROR, "invalid dts/pts combination\n"); + pkt->dts= pkt->pts= AV_NOPTS_VALUE; + } + if (pkt->duration == 0) { compute_frame_duration(&num, &den, st, pc, pkt); if (den && num) {

2 1

r25846 - trunk/libavformat/oggdec.c
by subversion＠mplayerhq.hu 16 Dec '10

16 Dec '10

Author: reimar Date: Mon Nov 29 20:02:28 2010 New Revision: 25846 Log: Ensure that data_offset is set correctly when there are partial data packets before the first complete one. Patch by Aaron Colwell [acolwell chromium org]. Modified: trunk/libavformat/oggdec.c Modified: trunk/libavformat/oggdec.c ============================================================================== --- trunk/libavformat/oggdec.c Mon Nov 29 17:38:12 2010 (r25845) +++ trunk/libavformat/oggdec.c Mon Nov 29 20:02:28 2010 (r25846) @@ -373,9 +373,27 @@ ogg_packet (AVFormatContext * s, int *st if (!os->header){ os->segp = segp; os->psize = psize; - if (!ogg->headers) - s->data_offset = os->sync_pos; + + // We have reached the first non-header packet. All header + // packets must be complete before the first non-header + // one, so everything that follows must be non-header. ogg->headers = 1; + + // Update the header state for all streams and + // compute the data_offset. + s->data_offset = os->sync_pos; + for (i = 0; i < ogg->nstreams; i++) { + struct ogg_stream *cur_os = ogg->streams + i; + // Set stream header state to 0 if its last packet + // was a header. + if (cur_os->header > 0) + cur_os->header = 0; + + // if we have a partial non-header packet, its start is + // obviously at or after the data start + if (cur_os->incomplete) + s->data_offset = FFMIN(s->data_offset, cur_os->sync_pos); + } }else{ os->pstart += os->psize; os->psize = 0;

2 1

r20814 - trunk/libavcodec/mpeg12.c
by subversion＠mplayerhq.hu 15 Dec '10

15 Dec '10

Author: michael Date: Sat Dec 12 20:44:01 2009 New Revision: 20814 Log: Be less picky on invalid invalid frame_pred_frame_dct values. Fixed issue1615. Modified: trunk/libavcodec/mpeg12.c Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c Sat Dec 12 20:15:56 2009 (r20813) +++ trunk/libavcodec/mpeg12.c Sat Dec 12 20:44:01 2009 (r20814) @@ -1557,7 +1557,7 @@ static void mpeg_decode_picture_coding_e s->picture_structure= PICT_FRAME; } - if(s->progressive_frame && !s->frame_pred_frame_dct){ + if(s->progressive_sequence && !s->frame_pred_frame_dct){ av_log(s->avctx, AV_LOG_ERROR, "invalid frame_pred_frame_dct\n"); s->frame_pred_frame_dct= 1; }

3 3

r25017 - in trunk/tests: codec-regression.sh ref/vsynth1/qtrle ref/vsynth2/qtrle
by subversion＠mplayerhq.hu 14 Dec '10

14 Dec '10

Author: vitor Date: Wed Sep 1 14:38:36 2010 New Revision: 25017 Log: QTRLE regtest Added: trunk/tests/ref/vsynth1/qtrle trunk/tests/ref/vsynth2/qtrle Modified: trunk/tests/codec-regression.sh Modified: trunk/tests/codec-regression.sh ============================================================================== --- trunk/tests/codec-regression.sh Wed Sep 1 12:26:28 2010 (r25016) +++ trunk/tests/codec-regression.sh Wed Sep 1 14:38:36 2010 (r25017) @@ -248,6 +248,11 @@ do_video_encoding roqav.roq "" "-vframes do_video_decoding "" "-pix_fmt yuv420p" fi +if [ -n "$do_qtrle" ] ; then +do_video_encoding qtrle.mov "" "" +do_video_decoding "" "" +fi + if [ -n "$do_rgb" ] ; then do_video_encoding rgb.avi "" "-an -vcodec rawvideo -pix_fmt bgr24" do_video_decoding "" "-pix_fmt yuv420p" Added: trunk/tests/ref/vsynth1/qtrle ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/tests/ref/vsynth1/qtrle Wed Sep 1 14:38:36 2010 (r25017) @@ -0,0 +1,4 @@ +3f070779d7deb54626515ac7f7002e63 *./tests/data/vsynth1/qtrle.mov +387772 ./tests/data/vsynth1/qtrle.mov +a3c2610e2c069c3ad22ec03da83f774f *./tests/data/qtrle.vsynth1.out.yuv +stddev: 15.14 PSNR: 24.53 MAXDIFF: 174 bytes: 7603200/ 7603200 Added: trunk/tests/ref/vsynth2/qtrle ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/tests/ref/vsynth2/qtrle Wed Sep 1 14:38:36 2010 (r25017) @@ -0,0 +1,4 @@ +5346bba8e03e7de72b482efbcf712a2e *./tests/data/vsynth2/qtrle.mov +141533 ./tests/data/vsynth2/qtrle.mov +f967b290c7e6d015c0e78175db828249 *./tests/data/qtrle.vsynth2.out.yuv +stddev: 5.75 PSNR: 32.93 MAXDIFF: 92 bytes: 7603200/ 7603200

2 1

r25857 - trunk/configure
by subversion＠mplayerhq.hu 30 Nov '10

30 Nov '10

Author: stefano Date: Tue Nov 30 22:41:26 2010 New Revision: 25857 Log: Add missing dependencies for frei0r_src in configure. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue Nov 30 21:14:41 2010 (r25856) +++ trunk/configure Tue Nov 30 22:41:26 2010 (r25857) @@ -1406,6 +1406,7 @@ udp_protocol_deps="network" blackframe_filter_deps="gpl" cropdetect_filter_deps="gpl" frei0r_filter_deps="frei0r dlopen strtok_r" +frei0r_src_filter_deps="frei0r dlopen strtok_r" ocv_smooth_filter_deps="libopencv" yadif_filter_deps="gpl"

1 0

r25855 - in trunk: Changelog doc/filters.texi libavfilter/Makefile libavfilter/allfilters.c libavfilter/avfilter.h libavfilter/vf_frei0r.c
by subversion＠mplayerhq.hu 30 Nov '10

30 Nov '10

Author: stefano Date: Tue Nov 30 21:14:36 2010 New Revision: 25855 Log: Implement frei0r source. Modified: trunk/Changelog trunk/doc/filters.texi trunk/libavfilter/Makefile trunk/libavfilter/allfilters.c trunk/libavfilter/avfilter.h trunk/libavfilter/vf_frei0r.c Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Tue Nov 30 21:14:29 2010 (r25854) +++ trunk/Changelog Tue Nov 30 21:14:36 2010 (r25855) @@ -60,6 +60,7 @@ version <next>: - rename aspect filter to setdar, and pixelaspect to setsar - IEC 61937 demuxer - Mobotix .mxg demuxer +- frei0r source added version 0.6: Modified: trunk/doc/filters.texi ============================================================================== --- trunk/doc/filters.texi Tue Nov 30 21:14:29 2010 (r25854) +++ trunk/doc/filters.texi Tue Nov 30 21:14:36 2010 (r25855) @@ -283,6 +283,7 @@ The following command: will convert the input video to the format "yuv420p". + at anchor{frei0r} @section frei0r Apply a frei0r effect to the input video. @@ -869,6 +870,34 @@ respectively 352 and 288 (corresponding timebase. The expression can contain the constants "PI", "E", "PHI", "AVTB" (the default timebase), and defaults to the value "AVTB". + at section frei0r_src + +Provide a frei0r source. + +To enable compilation of this filter you need to install the frei0r +header and configure FFmpeg with --enable-frei0r. + +The source supports the syntax: + at example + at var{size}:@var{rate}:@var{src_name}[@{=|:@}@var{param1}:@var{param2}:...:@var{paramN}] + at end example + + at var{size} is the size of the video to generate, may be a string of the +form @var{width}x at var{height} or a frame size abbreviation. + at var{rate} is the rate of the video to generate, may be a string of +the form @var{num}/@var{den} or a frame rate abbreviation. + at var{src_name} is the name to the frei0r source to load. For more +information regarding frei0r and how to set the parameters read the +section "frei0r" (@pxref{frei0r}) in the description of the video +filters. + +Some examples follow: + at example +# generate a frei0r partik0l source with size 200x200 and framerate 10 +# which is overlayed on the overlay filter main input +frei0r_src=200x200:10:partik0l=1234 [overlay]; [in][overlay] overlay + at end example + @c man end VIDEO SOURCES @chapter Video Sinks Modified: trunk/libavfilter/Makefile ============================================================================== --- trunk/libavfilter/Makefile Tue Nov 30 21:14:29 2010 (r25854) +++ trunk/libavfilter/Makefile Tue Nov 30 21:14:36 2010 (r25855) @@ -46,6 +46,7 @@ OBJS-$(CONFIG_YADIF_FILTER) OBJS-$(CONFIG_BUFFER_FILTER) += vsrc_buffer.o OBJS-$(CONFIG_COLOR_FILTER) += vf_pad.o +OBJS-$(CONFIG_FREI0R_SRC_FILTER) += vf_frei0r.o OBJS-$(CONFIG_NULLSRC_FILTER) += vsrc_nullsrc.o OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o Modified: trunk/libavfilter/allfilters.c ============================================================================== --- trunk/libavfilter/allfilters.c Tue Nov 30 21:14:29 2010 (r25854) +++ trunk/libavfilter/allfilters.c Tue Nov 30 21:14:36 2010 (r25855) @@ -67,6 +67,7 @@ void avfilter_register_all(void) REGISTER_FILTER (BUFFER, buffer, vsrc); REGISTER_FILTER (COLOR, color, vsrc); + REGISTER_FILTER (FREI0R, frei0r_src, vsrc); REGISTER_FILTER (NULLSRC, nullsrc, vsrc); REGISTER_FILTER (NULLSINK, nullsink, vsink); Modified: trunk/libavfilter/avfilter.h ============================================================================== --- trunk/libavfilter/avfilter.h Tue Nov 30 21:14:29 2010 (r25854) +++ trunk/libavfilter/avfilter.h Tue Nov 30 21:14:36 2010 (r25855) @@ -25,7 +25,7 @@ #include "libavutil/avutil.h" #define LIBAVFILTER_VERSION_MAJOR 1 -#define LIBAVFILTER_VERSION_MINOR 65 +#define LIBAVFILTER_VERSION_MINOR 66 #define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ Modified: trunk/libavfilter/vf_frei0r.c ============================================================================== --- trunk/libavfilter/vf_frei0r.c Tue Nov 30 21:14:29 2010 (r25854) +++ trunk/libavfilter/vf_frei0r.c Tue Nov 30 21:14:36 2010 (r25855) @@ -27,6 +27,7 @@ #include <dlfcn.h> #include <frei0r.h> #include "libavutil/avstring.h" +#include "libavcore/imgutils.h" #include "libavcore/parseutils.h" #include "avfilter.h" @@ -54,6 +55,11 @@ typedef struct Frei0rContext { f0r_destruct_f destruct; f0r_deinit_f deinit; char params[256]; + + /* only used by the source */ + int w, h; + AVRational time_base; + uint64_t pts; } Frei0rContext; static void *load_sym(AVFilterContext *ctx, const char *sym_name) @@ -197,18 +203,14 @@ static void *load_path(AVFilterContext * return dlopen(path, RTLD_NOW|RTLD_LOCAL); } -static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) +static av_cold int frei0r_init(AVFilterContext *ctx, + const char *dl_name, int type) { Frei0rContext *frei0r = ctx->priv; f0r_init_f f0r_init; f0r_get_plugin_info_f f0r_get_plugin_info; f0r_plugin_info_t *pi; - char dl_name[1024], *path; - - *frei0r->params = 0; - - if (args) - sscanf(args, "%1023[^:]:%255c", dl_name, frei0r->params); + char *path; /* see: http://piksel.org/frei0r/1.2/spec/1.2/spec/group__pluglocations.html */ if ((path = av_strdup(getenv("FREI0R_PATH")))) { @@ -250,9 +252,10 @@ static av_cold int init(AVFilterContext f0r_get_plugin_info(&frei0r->plugin_info); pi = &frei0r->plugin_info; - if (pi->plugin_type != F0R_PLUGIN_TYPE_FILTER) { + if (pi->plugin_type != type) { av_log(ctx, AV_LOG_ERROR, - "Invalid type '%s' for the plugin, a filter plugin was expected\n", + "Invalid type '%s' for the plugin\n", + pi->plugin_type == F0R_PLUGIN_TYPE_FILTER ? "filter" : pi->plugin_type == F0R_PLUGIN_TYPE_SOURCE ? "source" : pi->plugin_type == F0R_PLUGIN_TYPE_MIXER2 ? "mixer2" : pi->plugin_type == F0R_PLUGIN_TYPE_MIXER3 ? "mixer3" : "unknown"); @@ -271,6 +274,18 @@ static av_cold int init(AVFilterContext return 0; } +static av_cold int filter_init(AVFilterContext *ctx, const char *args, void *opaque) +{ + Frei0rContext *frei0r = ctx->priv; + char dl_name[1024]; + *frei0r->params = 0; + + if (args) + sscanf(args, "%1023[^:]:%255c", dl_name, frei0r->params); + + return frei0r_init(ctx, dl_name, F0R_PLUGIN_TYPE_FILTER); +} + static av_cold void uninit(AVFilterContext *ctx) { Frei0rContext *frei0r = ctx->priv; @@ -344,7 +359,7 @@ AVFilter avfilter_vf_frei0r = { .description = NULL_IF_CONFIG_SMALL("Apply a frei0r effect."), .query_formats = query_formats, - .init = init, + .init = filter_init, .uninit = uninit, .priv_size = sizeof(Frei0rContext), @@ -361,3 +376,89 @@ AVFilter avfilter_vf_frei0r = { .type = AVMEDIA_TYPE_VIDEO, }, { .name = NULL}}, }; + +static av_cold int source_init(AVFilterContext *ctx, const char *args, void *opaque) +{ + Frei0rContext *frei0r = ctx->priv; + char dl_name[1024], c; + char frame_size[128] = ""; + char frame_rate[128] = ""; + AVRational frame_rate_q; + + memset(frei0r->params, 0, sizeof(frei0r->params)); + + if (args) + sscanf(args, "%127[^:]:%127[^:]:%1023[^:=]%c%255c", + frame_size, frame_rate, dl_name, &c, frei0r->params); + + if (av_parse_video_size(&frei0r->w, &frei0r->h, frame_size) < 0) { + av_log(ctx, AV_LOG_ERROR, "Invalid frame size: '%s'\n", frame_size); + return AVERROR(EINVAL); + } + + if (av_parse_video_rate(&frame_rate_q, frame_rate) < 0 || + frame_rate_q.den <= 0 || frame_rate_q.num <= 0) { + av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: '%s'\n", frame_rate); + return AVERROR(EINVAL); + } + frei0r->time_base.num = frame_rate_q.den; + frei0r->time_base.den = frame_rate_q.num; + + return frei0r_init(ctx, dl_name, F0R_PLUGIN_TYPE_SOURCE); +} + +static int source_config_props(AVFilterLink *outlink) +{ + AVFilterContext *ctx = outlink->src; + Frei0rContext *frei0r = ctx->priv; + + if (av_image_check_size(frei0r->w, frei0r->h, 0, ctx) < 0) + return AVERROR(EINVAL); + outlink->w = frei0r->w; + outlink->h = frei0r->h; + outlink->time_base = frei0r->time_base; + + if (!(frei0r->instance = frei0r->construct(outlink->w, outlink->h))) { + av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance"); + return AVERROR(EINVAL); + } + + return set_params(ctx, frei0r->params); +} + +static int source_request_frame(AVFilterLink *outlink) +{ + Frei0rContext *frei0r = outlink->src->priv; + AVFilterBufferRef *picref = avfilter_get_video_buffer(outlink, AV_PERM_WRITE, outlink->w, outlink->h); + picref->video->pixel_aspect = (AVRational) {1, 1}; + picref->pts = frei0r->pts++; + picref->pos = -1; + + avfilter_start_frame(outlink, avfilter_ref_buffer(picref, ~0)); + frei0r->update(frei0r->instance, av_rescale_q(picref->pts, frei0r->time_base, (AVRational){1,1000}), + NULL, (uint32_t *)picref->data[0]); + avfilter_draw_slice(outlink, 0, outlink->h, 1); + avfilter_end_frame(outlink); + avfilter_unref_buffer(picref); + + return 0; +} + +AVFilter avfilter_vsrc_frei0r_src = { + .name = "frei0r_src", + .description = NULL_IF_CONFIG_SMALL("Generate a frei0r source."), + + .priv_size = sizeof(Frei0rContext), + .init = source_init, + .uninit = uninit, + + .query_formats = query_formats, + + .inputs = (AVFilterPad[]) {{ .name = NULL}}, + + .outputs = (AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .request_frame = source_request_frame, + .config_props = source_config_props }, + { .name = NULL}}, +};

2 1

r25856 - in trunk: doc/filters.texi libavfilter/vf_frei0r.c
by subversion＠mplayerhq.hu 30 Nov '10

30 Nov '10

Author: stefano Date: Tue Nov 30 21:14:41 2010 New Revision: 25856 Log: Extend the frei0r filter syntax. Make it accept the frei0r=filtername=params as alternative to frei0r=filtername:params. Modified: trunk/doc/filters.texi trunk/libavfilter/vf_frei0r.c Modified: trunk/doc/filters.texi ============================================================================== --- trunk/doc/filters.texi Tue Nov 30 21:14:36 2010 (r25855) +++ trunk/doc/filters.texi Tue Nov 30 21:14:41 2010 (r25856) @@ -293,7 +293,7 @@ header and configure FFmpeg with --enabl The filter supports the syntax: @example - at var{filter_name}:@var{param1}:@var{param2}:...:@var{paramN} + at var{filter_name}[@{:|=@}@var{param1}:@var{param2}:...:@var{paramN}] @end example @var{filter_name} is the name to the frei0r effect to load. If the Modified: trunk/libavfilter/vf_frei0r.c ============================================================================== --- trunk/libavfilter/vf_frei0r.c Tue Nov 30 21:14:36 2010 (r25855) +++ trunk/libavfilter/vf_frei0r.c Tue Nov 30 21:14:41 2010 (r25856) @@ -277,11 +277,11 @@ static av_cold int frei0r_init(AVFilterC static av_cold int filter_init(AVFilterContext *ctx, const char *args, void *opaque) { Frei0rContext *frei0r = ctx->priv; - char dl_name[1024]; + char dl_name[1024], c; *frei0r->params = 0; if (args) - sscanf(args, "%1023[^:]:%255c", dl_name, frei0r->params); + sscanf(args, "%1023[^:=]%c%255c", dl_name, &c, frei0r->params); return frei0r_init(ctx, dl_name, F0R_PLUGIN_TYPE_FILTER); }

1 0

r25854 - trunk/doc/texi2pod.pl
by subversion＠mplayerhq.hu 30 Nov '10

30 Nov '10

Author: stefano Date: Tue Nov 30 21:14:29 2010 New Revision: 25854 Log: Remove @anchor{} commands from the POD output. This allows to use the @xref{} command for the HTML output. Modified: trunk/doc/texi2pod.pl Modified: trunk/doc/texi2pod.pl ============================================================================== --- trunk/doc/texi2pod.pl Tue Nov 30 00:15:51 2010 (r25853) +++ trunk/doc/texi2pod.pl Tue Nov 30 21:14:29 2010 (r25854) @@ -346,6 +346,7 @@ sub postprocess # @* is also impossible in .pod; we discard it and any newline that # follows it. Similarly, our macro @gol must be discarded. + s/\@anchor{(?:[^\}]*)\}//g; s/$?\@xref\{(?:[^\}]*)\}(?:[^.<]|(?:<[^<>]*>))*\.$?//g; s/\s+$\@pxref\{(?:[^\}]*)\}$//g; s/;\s+\@pxref\{(?:[^\}]*)\}//g;

1 0