January 2011 - ffmpeg-cvslog - lists.ffmpeg.org

r26260 - in trunk: doc/APIchanges ffplay.c libavcodec/avcodec.h libavcodec/utils.c
by subversion＠mplayerhq.hu 08 Feb '11

08 Feb '11

Author: michael Date: Sat Jan 8 00:07:24 2011 New Revision: 26260 Log: Add AVFrame.pkt_pts that contains the correctly reordered AVPacket.pts Modified: trunk/doc/APIchanges trunk/ffplay.c trunk/libavcodec/avcodec.h trunk/libavcodec/utils.c Modified: trunk/doc/APIchanges ============================================================================== --- trunk/doc/APIchanges Fri Jan 7 23:27:26 2011 (r26259) +++ trunk/doc/APIchanges Sat Jan 8 00:07:24 2011 (r26260) @@ -13,6 +13,9 @@ libavutil: 2009-03-08 API changes, most recent first: +2011-01-07 - r26260 - lavc 52.105.0 - pkt_pts + Add pkt_pts to AVFrame. + 2011-01-XX - r26XXX - lavc 52.104.0 - av_get_profile_name() Add av_get_profile_name to libavcodec/avcodec.h. Modified: trunk/ffplay.c ============================================================================== --- trunk/ffplay.c Fri Jan 7 23:27:26 2011 (r26259) +++ trunk/ffplay.c Sat Jan 8 00:07:24 2011 (r26260) @@ -1652,6 +1652,8 @@ static int input_get_buffer(AVCodecConte pic->age = INT_MAX; pic->type = FF_BUFFER_TYPE_USER; pic->reordered_opaque = codec->reordered_opaque; + if(codec->pkt) pic->pkt_pts = codec->pkt->pts; + else pic->pkt_pts = AV_NOPTS_VALUE; return 0; } @@ -1677,6 +1679,8 @@ static int input_reget_buffer(AVCodecCon } pic->reordered_opaque = codec->reordered_opaque; + if(codec->pkt) pic->pkt_pts = codec->pkt->pts; + else pic->pkt_pts = AV_NOPTS_VALUE; return 0; } Modified: trunk/libavcodec/avcodec.h ============================================================================== --- trunk/libavcodec/avcodec.h Fri Jan 7 23:27:26 2011 (r26259) +++ trunk/libavcodec/avcodec.h Sat Jan 8 00:07:24 2011 (r26260) @@ -32,7 +32,7 @@ #include "libavutil/cpu.h" #define LIBAVCODEC_VERSION_MAJOR 52 -#define LIBAVCODEC_VERSION_MINOR 104 +#define LIBAVCODEC_VERSION_MINOR 105 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -1009,6 +1009,13 @@ typedef struct AVPanScan{ * - decoding: Set by libavcodec\ */\ void *hwaccel_picture_private;\ +\ + /**\ + * reordered pts from the last AVPacket that has been input into the decoder\ + * - encoding: unused\ + * - decoding: Read by user.\ + */\ + int64_t pkt_pts;\ #define FF_QSCALE_TYPE_MPEG1 0 @@ -2791,6 +2798,15 @@ typedef struct AVCodecContext { */ uint8_t *subtitle_header; int subtitle_header_size; + + /** + * Current packet as passed into the decoder, to avoid having + * to pass the packet into every function. Currently only valid + * inside lavc and get/release_buffer callbacks. + * - decoding: set by avcodec_decode_*, read by get_buffer() for setting pkt_pts + * - encoding: unused + */ + AVPacket *pkt; } AVCodecContext; /** Modified: trunk/libavcodec/utils.c ============================================================================== --- trunk/libavcodec/utils.c Fri Jan 7 23:27:26 2011 (r26259) +++ trunk/libavcodec/utils.c Sat Jan 8 00:07:24 2011 (r26260) @@ -344,6 +344,8 @@ int avcodec_default_get_buffer(AVCodecCo } s->internal_buffer_count++; + if(s->pkt) pic->pkt_pts= s->pkt->pts; + else pic->pkt_pts= AV_NOPTS_VALUE; pic->reordered_opaque= s->reordered_opaque; if(s->debug&FF_DEBUG_BUFFERS) @@ -628,6 +630,9 @@ int attribute_align_arg avcodec_decode_v *got_picture_ptr= 0; if((avctx->coded_width||avctx->coded_height) && av_image_check_size(avctx->coded_width, avctx->coded_height, 0, avctx)) return -1; + + avctx->pkt = avpkt; + if((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size){ ret = avctx->codec->decode(avctx, picture, got_picture_ptr, avpkt); @@ -662,6 +667,8 @@ int attribute_align_arg avcodec_decode_a { int ret; + avctx->pkt = avpkt; + if((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size){ //FIXME remove the check below _after_ ensuring that all audio check that the available space is enough if(*frame_size_ptr < AVCODEC_MAX_AUDIO_FRAME_SIZE){ @@ -703,6 +710,7 @@ int avcodec_decode_subtitle2(AVCodecCont { int ret; + avctx->pkt = avpkt; *got_sub_ptr = 0; ret = avctx->codec->decode(avctx, sub, got_sub_ptr, avpkt); if (*got_sub_ptr)

6 10

Add sample_aspect_ratio fields to vsrc_buffer arguments.
by git＠videolan.org 01 Feb '11

01 Feb '11

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 31 20:48:35 2011 +0100| [7b3ea5507cd79d7e80cb435fda20e70f90e18663] | committer: Michael Niedermayer Add sample_aspect_ratio fields to vsrc_buffer arguments. This fixes aspect handling in ffmpeg This is based on a patch by baptiste > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b3ea5507cd79d7e8… --- doc/APIchanges | 3 +++ doc/filters.texi | 11 ++++++++--- ffmpeg.c | 18 ++++++++++++++++-- libavfilter/avfilter.h | 2 +- libavfilter/vsrc_buffer.c | 7 +++++-- 5 files changed, 33 insertions(+), 8 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index d6d5f85..7f5594b 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,9 @@ libavutil: 2009-03-08 API changes, most recent first: +2011-01-31 - X - lavfi 1.76.0 - vsrc_buffer + Add sample_aspect_ratio fields to vsrc_buffer arguments + 2011-01-31 - X - lavfi 1.75.0 - AVFilterLink sample_aspect_ratio Add sample_aspect_ratio field to AVFilterLink. diff --git a/doc/filters.texi b/doc/filters.texi index 3842886..ccddc33 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1014,7 +1014,7 @@ This source is mainly intended for a programmatic use, in particular through the interface defined in @file{libavfilter/vsrc_buffer.h}. It accepts the following parameters: - at var{width}:@var{height}:@var{pix_fmt_string}:@var{timebase_num}:@var{timebase_den} + at var{width}:@var{height}:@var{pix_fmt_string}:@var{timebase_num}:@var{timebase_den}:@var{sample_aspect_ratio_num}:@var{sample_aspect_ratio.den} All the parameters need to be explicitely defined. @@ -1033,15 +1033,20 @@ name. @item timebase_num, timebase_den Specify numerator and denomitor of the timebase assumed by the timestamps of the buffered frames. + + at item sample_aspect_ratio.num, sample_aspect_ratio.den +Specify numerator and denominator of the sample aspect ratio assumed +by the video frames. @end table For example: @example -buffer=320:240:yuv410p:1:24 +buffer=320:240:yuv410p:1:24:1:1 @end example will instruct the source to accept video frames with size 320x240 and -with format "yuv410p" and assuming 1/24 as the timestamps timebase. +with format "yuv410p", assuming 1/24 as the timestamps timebase and +square pixels (1:1 sample aspect ratio). Since the pixel format with name "yuv410p" corresponds to the number 6 (check the enum PixelFormat definition in @file{libavutil/pixfmt.h}), this example corresponds to: diff --git a/ffmpeg.c b/ffmpeg.c index df89018..3ffa5c4 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -355,13 +355,21 @@ static int configure_filters(AVInputStream *ist, AVOutputStream *ost) AVCodecContext *codec = ost->st->codec; AVCodecContext *icodec = ist->st->codec; FFSinkContext ffsink_ctx = { .pix_fmt = codec->pix_fmt }; + AVRational sample_aspect_ratio; char args[255]; int ret; graph = avfilter_graph_alloc(); - snprintf(args, 255, "%d:%d:%d:%d:%d", ist->st->codec->width, - ist->st->codec->height, ist->st->codec->pix_fmt, 1, AV_TIME_BASE); + if (ist->st->sample_aspect_ratio.num){ + sample_aspect_ratio = ist->st->sample_aspect_ratio; + }else + sample_aspect_ratio = ist->st->codec->sample_aspect_ratio; + + snprintf(args, 255, "%d:%d:%d:%d:%d:%d:%d", ist->st->codec->width, + ist->st->codec->height, ist->st->codec->pix_fmt, 1, AV_TIME_BASE, + sample_aspect_ratio.num, sample_aspect_ratio.den); + ret = avfilter_graph_create_filter(&ist->input_video_filter, avfilter_get_by_name("buffer"), "src", args, NULL, graph); if (ret < 0) @@ -415,6 +423,8 @@ static int configure_filters(AVInputStream *ist, AVOutputStream *ost) codec->width = ist->output_video_filter->inputs[0]->w; codec->height = ist->output_video_filter->inputs[0]->h; + codec->sample_aspect_ratio = ost->st->sample_aspect_ratio = + ist->output_video_filter->inputs[0]->sample_aspect_ratio; return 0; } @@ -2845,6 +2855,10 @@ static void opt_frame_aspect_ratio(const char *arg) ffmpeg_exit(1); } frame_aspect_ratio = ar; + + x = vfilters ? strlen(vfilters) : 0; + vfilters = av_realloc(vfilters, x+100); + snprintf(vfilters+x, x+100, "%csetdar=%f\n", x?',':' ', ar); } static int opt_metadata(const char *opt, const char *arg) diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 48555fd..451d0be 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -27,7 +27,7 @@ #include "libavcore/samplefmt.h" #define LIBAVFILTER_VERSION_MAJOR 1 -#define LIBAVFILTER_VERSION_MINOR 75 +#define LIBAVFILTER_VERSION_MINOR 76 #define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ diff --git a/libavfilter/vsrc_buffer.c b/libavfilter/vsrc_buffer.c index 74d9bf6..6845c74 100644 --- a/libavfilter/vsrc_buffer.c +++ b/libavfilter/vsrc_buffer.c @@ -68,8 +68,10 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) int n = 0; if (!args || - (n = sscanf(args, "%d:%d:%127[^:]:%d:%d", &c->w, &c->h, pix_fmt_str, &c->time_base.num, &c->time_base.den)) != 5) { - av_log(ctx, AV_LOG_ERROR, "Expected 5 arguments, but only %d found in '%s'\n", n, args); + (n = sscanf(args, "%d:%d:%127[^:]:%d:%d:%d:%d", &c->w, &c->h, pix_fmt_str, + &c->time_base.num, &c->time_base.den, + &c->pixel_aspect.num, &c->pixel_aspect.den)) != 7) { + av_log(ctx, AV_LOG_ERROR, "Expected 7 arguments, but only %d found in '%s'\n", n, args); return AVERROR(EINVAL); } if ((c->pix_fmt = av_get_pix_fmt(pix_fmt_str)) == PIX_FMT_NONE) { @@ -100,6 +102,7 @@ static int config_props(AVFilterLink *link) link->w = c->w; link->h = c->h; + link->sample_aspect_ratio = c->pixel_aspect; link->time_base = c->time_base; return 0;

3 3

Add sample_aspect_ratio to AVFilterLink
by git＠videolan.org 31 Jan '11

31 Jan '11

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 31 18:51:47 2011 +0100| [14b171cd71f2b5f1cc66e4df89c2692f68ac098b] | committer: Michael Niedermayer Add sample_aspect_ratio to AVFilterLink > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=14b171cd71f2b5f1c… --- doc/APIchanges | 3 +++ libavfilter/avfilter.c | 4 ++++ libavfilter/avfilter.h | 5 +++-- libavfilter/vf_aspect.c | 14 ++++++++++++++ libavfilter/vf_transpose.c | 5 +++++ 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index aa1221d..d6d5f85 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,9 @@ libavutil: 2009-03-08 API changes, most recent first: +2011-01-31 - X - lavfi 1.75.0 - AVFilterLink sample_aspect_ratio + Add sample_aspect_ratio field to AVFilterLink. + 2011-01-15 - r26374 - lavfi 1.74.0 - AVFilterBufferRefAudioProps Rename AVFilterBufferRefAudioProps.samples_nb to nb_samples. diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 6581af5..aad3a5b 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -194,6 +194,10 @@ int avfilter_config_links(AVFilterContext *filter) link->time_base = link->src && link->src->input_count ? link->src->inputs[0]->time_base : AV_TIME_BASE_Q; + if (link->sample_aspect_ratio.num == 0 && link->sample_aspect_ratio.den == 0) + link->sample_aspect_ratio = link->src->input_count ? + link->src->inputs[0]->sample_aspect_ratio : (AVRational){1,1}; + if ((config_link = link->dstpad->config_props)) if ((ret = config_link(link)) < 0) return ret; diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index ad8b1e5..48555fd 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -27,7 +27,7 @@ #include "libavcore/samplefmt.h" #define LIBAVFILTER_VERSION_MAJOR 1 -#define LIBAVFILTER_VERSION_MINOR 74 +#define LIBAVFILTER_VERSION_MINOR 75 #define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ @@ -580,9 +580,10 @@ struct AVFilterLink { enum AVMediaType type; ///< filter media type - /* These two parameters apply only to video */ + /* These parameters apply only to video */ int w; ///< agreed upon image width int h; ///< agreed upon image height + AVRational sample_aspect_ratio; ///< agreed upon sample aspect ratio /* These two parameters apply only to audio */ int64_t channel_layout; ///< channel layout of current buffer (see libavcore/audioconvert.h) int64_t sample_rate; ///< samples per second diff --git a/libavfilter/vf_aspect.c b/libavfilter/vf_aspect.c index 6f86bf2..95bfb66 100644 --- a/libavfilter/vf_aspect.c +++ b/libavfilter/vf_aspect.c @@ -82,6 +82,9 @@ static int setdar_config_props(AVFilterLink *inlink) av_log(inlink->dst, AV_LOG_INFO, "w:%d h:%d -> dar:%d/%d par:%d/%d\n", inlink->w, inlink->h, dar.num, dar.den, aspect->aspect.num, aspect->aspect.den); + + inlink->sample_aspect_ratio = aspect->aspect; + return 0; } @@ -108,6 +111,16 @@ AVFilter avfilter_vf_setdar = { #endif /* CONFIG_SETDAR_FILTER */ #if CONFIG_SETSAR_FILTER +/* for setdar filter, convert from frame aspect ratio to pixel aspect ratio */ +static int setsar_config_props(AVFilterLink *inlink) +{ + AspectContext *aspect = inlink->dst->priv; + + inlink->sample_aspect_ratio = aspect->aspect; + + return 0; +} + AVFilter avfilter_vf_setsar = { .name = "setsar", .description = NULL_IF_CONFIG_SMALL("Set the pixel sample aspect ratio."), @@ -118,6 +131,7 @@ AVFilter avfilter_vf_setsar = { .inputs = (AVFilterPad[]) {{ .name = "default", .type = AVMEDIA_TYPE_VIDEO, + .config_props = setsar_config_props, .get_video_buffer = avfilter_null_get_video_buffer, .start_frame = start_frame, .end_frame = avfilter_null_end_frame }, diff --git a/libavfilter/vf_transpose.c b/libavfilter/vf_transpose.c index 970c381..272b17f 100644 --- a/libavfilter/vf_transpose.c +++ b/libavfilter/vf_transpose.c @@ -102,6 +102,11 @@ static int config_props_output(AVFilterLink *outlink) outlink->w = inlink->h; outlink->h = inlink->w; + if (inlink->sample_aspect_ratio.num){ + outlink->sample_aspect_ratio = av_div_q((AVRational){1,1}, inlink->sample_aspect_ratio); + } else + outlink->sample_aspect_ratio = inlink->sample_aspect_ratio; + av_log(ctx, AV_LOG_INFO, "w:%d h:%d dir:%d -> w:%d h:%d rotation:%s vflip:%d\n", inlink->w, inlink->h, trans->dir, outlink->w, outlink->h, trans->dir == 1 || trans->dir == 3 ? "clockwise" : "counterclockwise",

1 0

Remove pts rescaling code that is useless after 2ff4a2764e5ea74c85b4231bc110540278cf3708
by git＠videolan.org 31 Jan '11

31 Jan '11

ffmpeg | branch: master | Reimar D?ffinger <Reimar.Doeffinger at gmx.de> | Mon Jan 31 19:25:59 2011 +0100| [b482c001214fc519cf6be7802458bf8e441991b7] | committer: Reimar D?ffinger Remove pts rescaling code that is useless after 2ff4a2764e5ea74c85b4231bc110540278cf3708 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b482c001214fc519c… --- libavformat/vc1testenc.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/libavformat/vc1testenc.c b/libavformat/vc1testenc.c index 6023884..567efb2 100644 --- a/libavformat/vc1testenc.c +++ b/libavformat/vc1testenc.c @@ -56,14 +56,11 @@ static int vc1test_write_packet(AVFormatContext *s, AVPacket *pkt) { RCVContext *ctx = s->priv_data; ByteIOContext *pb = s->pb; - uint32_t pts = av_rescale(pkt->pts, - 1000 * (uint64_t)s->streams[0]->time_base.num, - s->streams[0]->time_base.den); if (!pkt->size) return 0; put_le32(pb, pkt->size | ((pkt->flags & AV_PKT_FLAG_KEY) ? 0x80000000 : 0)); - put_le32(pb, pts); + put_le32(pb, pkt->pts); put_buffer(pb, pkt->data, pkt->size); put_flush_packet(pb); ctx->frames++;

1 0

Document that av_write_header sets stream time_base to a value of it chosing .
by git＠videolan.org 31 Jan '11

31 Jan '11

ffmpeg | branch: master | Reimar D?ffinger <Reimar.Doeffinger at gmx.de> | Sat Jan 29 13:53:14 2011 +0100| [12763671e2dca7ab116e1ad81a2836819ff90730] | committer: Reimar D?ffinger Document that av_write_header sets stream time_base to a value of it chosing. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12763671e2dca7ab1… --- libavformat/avformat.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index f9f9be5..82991c1 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -507,6 +507,8 @@ typedef struct AVStream { * This is the fundamental unit of time (in seconds) in terms * of which frame timestamps are represented. For fixed-fps content, * time base should be 1/framerate and timestamp increments should be 1. + * decoding: set by libavformat + * encoding: set by libavformat in av_write_header */ AVRational time_base; int pts_wrap_bits; /**< number of bits in pts (used for wrapping control) */ @@ -1374,6 +1376,8 @@ void av_url_split(char *proto, int proto_size, /** * Allocate the stream private data and write the stream header to an * output media file. + * Note: this sets stream time-bases, if possible to stream->codec->time_base + * but for some formats it might also be some other time base * * @param s media file handle * @return 0 if OK, AVERROR_xxx on error

1 0

VC1testenc: convert pts values to correct time-base.
by git＠videolan.org 31 Jan '11

31 Jan '11

ffmpeg | branch: master | Reimar D?ffinger <Reimar.Doeffinger at gmx.de> | Sat Jan 29 13:44:34 2011 +0100| [2ff4a2764e5ea74c85b4231bc110540278cf3708] | committer: Michael Niedermayer VC1testenc: convert pts values to correct time-base. Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com> (cherry picked from commit 22e9277aa5e6e5abfd037420093439058d4a14df) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ff4a2764e5ea74c8… --- libavformat/vc1testenc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libavformat/vc1testenc.c b/libavformat/vc1testenc.c index 06431da..6023884 100644 --- a/libavformat/vc1testenc.c +++ b/libavformat/vc1testenc.c @@ -47,6 +47,7 @@ static int vc1test_write_header(AVFormatContext *s) put_le32(pb, s->streams[0]->r_frame_rate.den); else put_le32(pb, 0xFFFFFFFF); //variable framerate + av_set_pts_info(s->streams[0], 32, 1, 1000); return 0; }

1 0

mpegtsenc: fix PMT PID calculation
by git＠videolan.org 31 Jan '11

31 Jan '11

ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Mon Jan 31 16:49:10 2011 +0000| [2c30f7b3d7ea6ffe5370ea18e847455e7fae3940] | committer: Michael Niedermayer mpegtsenc: fix PMT PID calculation 445996aa51f4f1d9a26456a8511988291a720ba0 caused the PMT PID to be off by one. This corrects it. Signed-off-by: Mans Rullgard <mans at mansr.com> (cherry picked from commit 740ad0d14d1eca7319a34866e896ad93cd65b9e9) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c30f7b3d7ea6ffe5… --- libavformat/mpegtsenc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index a1bd14c..b1bccd1 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -396,7 +396,7 @@ static MpegTSService *mpegts_add_service(MpegTSWrite *ts, service = av_mallocz(sizeof(MpegTSService)); if (!service) return NULL; - service->pmt.pid = ts->pmt_start_pid + ts->nb_services; + service->pmt.pid = ts->pmt_start_pid + ts->nb_services - 1; service->sid = sid; service->provider_name = av_strdup(provider_name); service->name = av_strdup(name);

1 0

Rename attribute_used to av_used and move it to attributes.h
by git＠videolan.org 31 Jan '11

31 Jan '11

ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Mon Jan 31 02:19:30 2011 +0000| [0374152f8926bb3d0f2cd9cca56d12521fe0f71b] | committer: Michael Niedermayer Rename attribute_used to av_used and move it to attributes.h This is consistent with most of the other attribute macros. Signed-off-by: Mans Rullgard <mans at mansr.com> (cherry picked from commit 365e3c7878e4e821d5dec922d2d51f92ce13f926) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0374152f8926bb3d0… --- libavutil/attributes.h | 13 +++++++++++++ libavutil/internal.h | 14 -------------- libavutil/mem.h | 2 +- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/libavutil/attributes.h b/libavutil/attributes.h index d93f460..65a9249 100644 --- a/libavutil/attributes.h +++ b/libavutil/attributes.h @@ -96,6 +96,19 @@ #endif #endif +/** + * Mark a variable as used and prevent the compiler from optimizing it + * away. This is useful for variables accessed only from inline + * assembler without the compiler being aware. + */ +#ifndef av_used +#if AV_GCC_VERSION_AT_LEAST(3,1) +# define av_used __attribute__((used)) +#else +# define av_used +#endif +#endif + #ifndef av_alias #if (!defined(__ICC) || __ICC > 1200) && AV_GCC_VERSION_AT_LEAST(3,3) # define av_alias __attribute__((may_alias)) diff --git a/libavutil/internal.h b/libavutil/internal.h index 748a823..36d3e71 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -46,20 +46,6 @@ #endif #endif - -/** - * Mark a variable as used and prevent the compiler from optimizing it away. - * This is useful for asm that accesses varibles in ways that the compiler does not - * understand - */ -#ifndef attribute_used -#if AV_GCC_VERSION_AT_LEAST(3,1) -# define attribute_used __attribute__((used)) -#else -# define attribute_used -#endif -#endif - #ifndef INT16_MIN #define INT16_MIN (-0x7fff - 1) #endif diff --git a/libavutil/mem.h b/libavutil/mem.h index ab73a32..33ab48f 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -41,7 +41,7 @@ static const t __attribute__((aligned(n))) v #elif defined(__GNUC__) #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v - #define DECLARE_ASM_CONST(n,t,v) static const t attribute_used __attribute__ ((aligned (n))) v + #define DECLARE_ASM_CONST(n,t,v) static const t av_used __attribute__ ((aligned (n))) v #elif defined(_MSC_VER) #define DECLARE_ALIGNED(n,t,v) __declspec(align(n)) t v #define DECLARE_ASM_CONST(n,t,v) __declspec(align(n)) static const t v

1 0

Replace defines in libavformat/mpegtsenc.c with AVOptions
by git＠videolan.org 31 Jan '11

31 Jan '11

ffmpeg | branch: master | Georgi Chorbadzhiyski <gf at unixsol.org> | Mon Jan 31 13:19:51 2011 +0200| [a735bbbb7a27fa89318d60b91558c3045b6b27c6] | committer: Michael Niedermayer Replace defines in libavformat/mpegtsenc.c with AVOptions Around 01/28/11 18:56, Ronald S. Bultje scribbled: > That patch is now merged, can you submit the update to muxers.texi? > Then we'll apply the whole thing. See attached. I hope the documentation is enough. -- Georgi Chorbadzhiyski http://georgi.unixsol.org/

1 0

Add documentation for the image2 muxer.
by git＠videolan.org 31 Jan '11

31 Jan '11

ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Wed Jan 26 22:53:00 2011 +0100| [29f22e049a9e45fbd8ee5265e3b8058ca4597ae8] | committer: Michael Niedermayer Add documentation for the image2 muxer. Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com> (cherry picked from commit e771d2e3fef4d2bcfc08b9eb37296f0e0af1f607) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=29f22e049a9e45fbd… --- doc/muxers.texi | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index c3dcf11..969051a 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -18,4 +18,54 @@ enabled muxers. A description of some of the currently available muxers follows. + at section image2 + +Image file muxer. + +This muxer writes video frames to multiple image files specified by a +pattern. + +The pattern may contain the string "%d" or "%0 at var{N}d", which +specifies the position of the characters representing a numbering in +the filenames. If the form "%d0 at var{N}d" is used, the string +representing the number in each filename is 0-padded to @var{N} +digits. The literal character '%' can be specified in the pattern with +the string "%%". + +If the pattern contains "%d" or "%0 at var{N}d", the first filename of +the file list specified will contain the number 1, all the following +numbers will be sequential. + +The pattern may contain a suffix which is used to automatically +determine the format of the image files to write. + +For example the pattern "img-%03d.bmp" will specify a sequence of +filenames of the form @file{img-001.bmp}, @file{img-002.bmp}, ..., + at file{img-010.bmp}, etc. +The pattern "img%%-%d.jpg" will specify a sequence of filenames of the +form @file{img%-1.jpg}, @file{img%-2.jpg}, ..., @file{img%-10.jpg}, +etc. + +The following example shows how to use @file{ffmpeg} for creating a +sequence of files @file{img-001.jpeg}, @file{img-002.jpeg}, ..., +taking one image every second from the input video: + at example +ffmpeg -i in.avi -r 1 -f image2 'img-%03d.jpeg' + at end example + +Note that with @file{ffmpeg}, if the format is not specified with the + at code{-f} option and the output filename specifies an image file +format, the image2 muxer is automatically selected, so the previous +command can be written as: + at example +ffmpeg -i in.avi -r 1 'img-%03d.jpeg' + at end example + +Note also that the pattern must not necessarily contain "%d" or +"%0 at var{N}d", for example to create a single image file + at file{img.jpeg} from the input video you can employ the command: + at example +ffmpeg -i in.avi -f image2 -vframes 1 img.jpeg + at end example + @c man end MUXERS

1 0