diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-27 03:51:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-27 03:51:04 +0200 |
| commit | d7e5aebae7652ac766034f1d90e5a4f62677fb3c (patch) | |
| tree | b77ee45f34455cf9aa6e28105a7533ecc204b898 /libavfilter | |
| parent | 93c28a55fd84280d97c3c0dd7b0d546043242c34 (diff) | |
| parent | 79ee8977c25eee2408ef7b2822f377a983e4d65b (diff) | |
| download | ffmpeg-d7e5aebae7652ac766034f1d90e5a4f62677fb3c.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master: (23 commits)
ac3enc: correct the flipped sign in the ac3_fixed encoder
Eliminate pointless '#if 1' statements without matching '#else'.
Add AVX FFT implementation.
Increase alignment of av_malloc() as needed by AVX ASM.
Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
documentation: extend documentation for ffmpeg -aspect option
APIChanges: update commit hashes for recent additions.
lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
aac: add headers needed for log2f()
lavc: remove FF_API_MB_Q cruft
lavc: remove FF_API_RATE_EMU cruft
lavc: remove FF_API_HURRY_UP cruft
pad: make the filter parametric
vsrc_movie: add key_frame and pict_type.
vsrc_movie: fix leak in request_frame()
lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
vsrc_buffer: add sample_aspect_ratio fields to arguments.
lavfi: add fieldorder filter
scale: make the filter parametric
...
Conflicts:
Changelog
doc/filters.texi
ffmpeg.c
libavcodec/ac3dec.h
libavcodec/dsputil.c
libavfilter/avfilter.h
libavfilter/vf_scale.c
libavfilter/vf_yadif.c
libavfilter/vsrc_buffer.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfilter.h | 6 | ||||
| -rw-r--r-- | libavfilter/vf_scale.c | 4 | ||||
| -rw-r--r-- | libavfilter/vf_yadif.c | 3 | ||||
| -rw-r--r-- | libavfilter/vsrc_buffer.c | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 6525f57281..4bbd761b18 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -26,8 +26,8 @@ #include "libavutil/samplefmt.h" #define LIBAVFILTER_VERSION_MAJOR 2 -#define LIBAVFILTER_VERSION_MINOR 0 -#define LIBAVFILTER_VERSION_MICRO 0 +#define LIBAVFILTER_VERSION_MINOR 3 +#define LIBAVFILTER_VERSION_MICRO 1 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ @@ -115,7 +115,7 @@ typedef struct AVFilterBufferRefVideoProps { AVRational pixel_aspect; ///< pixel aspect ratio int interlaced; ///< is frame interlaced int top_field_first; ///< field order - int pict_type; ///< Picture type of the frame + enum AVPictureType pict_type; ///< picture type of the frame int key_frame; ///< 1 -> keyframe, 0-> not } AVFilterBufferRefVideoProps; diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 9c3868baf4..27214a6a2f 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -75,8 +75,8 @@ typedef struct { int input_is_pal; ///< set to 1 if the input format is paletted int interlaced; - char w_expr[256]; ///< width expression string - char h_expr[256]; ///< height expression string + char w_expr[256]; ///< width expression string + char h_expr[256]; ///< height expression string } ScaleContext; static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index 6d88476fcf..d608c65242 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -1,7 +1,6 @@ /* * Copyright (C) 2006-2010 Michael Niedermayer <michaelni@gmx.at> - * 2010 James Darnley <james.darnley@gmail.com> - * This file is part of FFmpeg. + * 2010 James Darnley <james.darnley@gmail.com> * * FFmpeg is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libavfilter/vsrc_buffer.c b/libavfilter/vsrc_buffer.c index 72ee99f123..c683d51e6f 100644 --- a/libavfilter/vsrc_buffer.c +++ b/libavfilter/vsrc_buffer.c @@ -131,7 +131,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) (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 %d found in '%s'\n", n, args); + 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) { |