]>
git.sesse.net Git - ffmpeg/log
Nicolas George [Sun, 19 Aug 2012 09:23:59 +0000 (11:23 +0200)]
ffmpeg: reindent after last commit.
Nicolas George [Fri, 17 Aug 2012 11:50:16 +0000 (13:50 +0200)]
ffmpeg: reduce differences with avconv for in/out scheduling.
Rework the transcode() function and its immediate annexes to have
the same structure as in avconv, while still maintaining proper
scheduling to avoid accumulation.
Using -filter_complex without inputs now works.
Michael Niedermayer [Sun, 19 Aug 2012 00:42:53 +0000 (02:42 +0200)]
ffmpeg: Clip invalid video timestamps like audio instead of failing hard.
Fixes Ticket976
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Aug 2012 02:03:03 +0000 (04:03 +0200)]
rawdec: support AVRn 1:1 raw interlaced mode
Fixes Ticket971
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Sat, 18 Aug 2012 20:27:49 +0000 (22:27 +0200)]
lavf/segment: fix computation of M3U8 segment target duration
Use ceil on the max duration, rather than approximating it to the nearest
integer.
Michael Niedermayer [Sat, 18 Aug 2012 19:54:52 +0000 (21:54 +0200)]
elbg: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Aug 2012 19:53:32 +0000 (21:53 +0200)]
elbg: fix assert
It seems the condition was flipped from what was intended
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 16 Aug 2012 22:08:51 +0000 (00:08 +0200)]
lavf: add use_wallclock_as_timestamps
This may fix Ticket730
Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Sat, 18 Aug 2012 12:12:41 +0000 (14:12 +0200)]
lavf/au: check bits per coded sample.
Without that, it would repeatedly produce empty packets
if the codec if forced to something invalid.
Fix trac ticket #1652.
Michael Niedermayer [Sat, 18 Aug 2012 14:36:16 +0000 (16:36 +0200)]
buildsys: fix cleaning of libmpcodecs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Uoti Urpala [Sat, 18 Aug 2012 14:11:45 +0000 (16:11 +0200)]
h264: vdpau: fix crash with unsupported colorspace
The h264_vdpau decoder crashed if output colorspace was not 8-bit 420.
Add a check to error out instead (current hardware does not support
other colorspaces, so successful decoding is not possible).
Check implemented at a different place by michael, thus blame for bugs goes to michael
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Aug 2012 13:10:13 +0000 (15:10 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo_enc: don't use deprecated avcodec_encode_video().
cmdutils: refactor -codecs option.
avconv: make -shortest a per-output file option.
lavc: add avcodec_descriptor_get_by_name().
lavc: add const to AVCodec* function parameters.
swf(dec): replace CODEC_ID with AV_CODEC_ID
dvenc: don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE
rtmpdh: Do not generate the same private key every time when using libnettle
rtp: remove ff_rtp_get_rtcp_file_handle().
rtsp.c: use ffurl_get_multi_file_handle() instead of ff_rtp_get_rtcp_file_handle()
avio: add (ff)url_get_multi_file_handle() for getting more than one fd
h264: vdpau: fix crash with unsupported colorspace
amrwbdec: Decode the fr_quality bit properly
Conflicts:
Changelog
cmdutils.c
cmdutils_common_opts.h
doc/ffmpeg.texi
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c
libavcodec/h264.c
libavcodec/options.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Wed, 15 Aug 2012 22:23:17 +0000 (00:23 +0200)]
doc/muxers: simplify segment examples
The simplifications are due to the recent option changes.
Stefano Sabatini [Wed, 15 Aug 2012 22:20:48 +0000 (00:20 +0200)]
lavf/segment: change default value for segment_list_size option, from 5 to 0
This is technically a major compatibility break, but seems the most
natural default and what users would expect without reading the docs.
Stefano Sabatini [Wed, 15 Aug 2012 22:16:28 +0000 (00:16 +0200)]
lavf/segment: guess list type from list filename suffix
Stefano Sabatini [Thu, 16 Aug 2012 17:06:00 +0000 (19:06 +0200)]
lavfi/mp: remove framestep wrapped filter
An equivalent framestep filter has been natively integrated.
Stefano Sabatini [Thu, 16 Aug 2012 17:04:26 +0000 (19:04 +0200)]
lavfi: add framestep filter
This filter is inspired upon libmpcodecs/vf_framestep.c, by Daniele
Forghieri.
Only-keyframe output is not supported, since that feature can be achieved
through the more versatile select filter.
Stefano Sabatini [Thu, 16 Aug 2012 19:53:30 +0000 (21:53 +0200)]
lavfi/testsrc: set output framerate
Stefano Sabatini [Wed, 15 Aug 2012 09:06:34 +0000 (11:06 +0200)]
lavf/segment: add M3U8 list support
Address trac ticket #1642.
Stefano Sabatini [Wed, 15 Aug 2012 21:14:34 +0000 (23:14 +0200)]
lavf/segment: compute max list segment duration
This is useful for the M3U8 format incoming patch.
Stefano Sabatini [Wed, 15 Aug 2012 21:21:41 +0000 (23:21 +0200)]
lavf/segment: create segment_list_open and close functions
Allow factorization for the incoming patches, and avoid code/logic
duplication.
Stefano Sabatini [Wed, 15 Aug 2012 20:12:11 +0000 (22:12 +0200)]
lavf/segment: fix bogus segment index rewrapping logic
Decouple segment index wrapping and segment count logic. The counter
should not be reset since it detects the segment increasing timeframe.
Stefano Sabatini [Wed, 15 Aug 2012 20:20:16 +0000 (22:20 +0200)]
lavf/segment: move file description to @file doxy
Stefano Sabatini [Wed, 15 Aug 2012 23:25:05 +0000 (01:25 +0200)]
lavf/avio: flush internal buffer when calling avio_close()
This seems the expected behavior.
Stefano Sabatini [Wed, 15 Aug 2012 08:56:20 +0000 (10:56 +0200)]
lavf/avio.h: doxygen avio_flush()
Stefano Sabatini [Sun, 12 Aug 2012 09:11:30 +0000 (11:11 +0200)]
ffmpeg,ffplay: show filter options
Address trac ticket #1599.
Stefano Sabatini [Mon, 13 Aug 2012 11:40:01 +0000 (13:40 +0200)]
lavfi: add priv class to filter definitions and flags to filter internal options
This allows the iteration callbacks to discover the internal class and
options, and show them when required.
Stefano Sabatini [Mon, 13 Aug 2012 11:30:50 +0000 (13:30 +0200)]
lavfi/movie: split class definitions for movie and amovie
This is required for iterating through the filter class (without
incurring into a loop).
Stefano Sabatini [Thu, 9 Aug 2012 15:48:03 +0000 (17:48 +0200)]
lavfi/lut: duplicate class definitions for each lut variant filter
This is due to the design of components iteration through AVClass
child_class_next() callback, which requires that two components cannot
share the same class.
Stefano Sabatini [Sat, 11 Aug 2012 09:58:57 +0000 (11:58 +0200)]
doc/Makefile: add doc target, as an alias for "documentation"
Consistent with --enable-doc, and easier to type.
Nicolas George [Fri, 17 Aug 2012 14:43:50 +0000 (16:43 +0200)]
lavc/tscc: use reget_buffer.
The previous code would release the buffer and get it
immediately after, assuming the contents is the same.
Anton Khirnov [Wed, 15 Aug 2012 07:35:18 +0000 (09:35 +0200)]
mpegvideo_enc: don't use deprecated avcodec_encode_video().
Anton Khirnov [Sat, 11 Aug 2012 13:23:22 +0000 (15:23 +0200)]
cmdutils: refactor -codecs option.
Make it print a list of AVCodecDescriptors.
Add new -decoders and -encoders options that print lists of decoders and
encoders respectively.
Anton Khirnov [Sat, 11 Aug 2012 09:50:32 +0000 (11:50 +0200)]
avconv: make -shortest a per-output file option.
Anton Khirnov [Sat, 11 Aug 2012 13:32:27 +0000 (15:32 +0200)]
lavc: add avcodec_descriptor_get_by_name().
Anton Khirnov [Sat, 11 Aug 2012 12:50:36 +0000 (14:50 +0200)]
lavc: add const to AVCodec* function parameters.
Anton Khirnov [Wed, 15 Aug 2012 07:14:35 +0000 (09:14 +0200)]
swf(dec): replace CODEC_ID with AV_CODEC_ID
Anton Khirnov [Wed, 15 Aug 2012 07:11:31 +0000 (09:11 +0200)]
dvenc: don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE
Michael Niedermayer [Sat, 18 Aug 2012 03:02:58 +0000 (05:02 +0200)]
ffmenc: switch to av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 18 Aug 2012 03:02:08 +0000 (05:02 +0200)]
acelp_filters: switch to avassert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Samuel Pitoiset [Thu, 16 Aug 2012 20:27:15 +0000 (22:27 +0200)]
rtmpdh: Do not generate the same private key every time when using libnettle
Replace mpz_random by mpz_urandomb with a random state initialization in
order to improve the randomness.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Fri, 17 Aug 2012 15:34:30 +0000 (17:34 +0200)]
libvpxenc: Fix CQ encoding without a specified bitrate
Also print a warning if neither quality nor bitrate is specified
and use the libvpx default bitrate in this case.
The idea of using the default bitrate is from Luca Barbato
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 Aug 2012 15:11:24 +0000 (17:11 +0200)]
libvpxenc: only force CBR if a bitrate is set
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jordi Ortiz [Fri, 17 Aug 2012 16:41:26 +0000 (18:41 +0200)]
rtp: remove ff_rtp_get_rtcp_file_handle().
Signed-off-by: Martin Storsjö <martin@martin.st>
Jordi Ortiz [Fri, 17 Aug 2012 18:06:27 +0000 (20:06 +0200)]
rtsp.c: use ffurl_get_multi_file_handle() instead of ff_rtp_get_rtcp_file_handle()
Signed-off-by: Martin Storsjö <martin@martin.st>
Jordi Ortiz [Fri, 17 Aug 2012 16:38:59 +0000 (18:38 +0200)]
avio: add (ff)url_get_multi_file_handle() for getting more than one fd
Signed-off-by: Martin Storsjö <martin@martin.st>
Uoti Urpala [Tue, 7 Aug 2012 11:48:06 +0000 (14:48 +0300)]
h264: vdpau: fix crash with unsupported colorspace
The h264_vdpau decoder crashed if output colorspace was not 8-bit 420.
Add a check to error out instead (current hardware does not support
other colorspaces, so successful decoding is not possible).
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 17 Aug 2012 11:53:52 +0000 (14:53 +0300)]
amrwbdec: Decode the fr_quality bit properly
The way this bit is decoded was accidentally flipped in
b70feb405 ,
leading to warnings "Encountered a bad or corrupted frame" for each
decoded frame.
Signed-off-by: Martin Storsjö <martin@martin.st>
Nedeljko Babic [Fri, 27 Jul 2012 12:17:07 +0000 (14:17 +0200)]
mips: change list of files with MIPS copyright notice in mips.txt
Add files created for MP3 optimization that have MIPS copyright
notice in them to list of files in mips.txt.
Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nedeljko Babic [Fri, 27 Jul 2012 12:17:06 +0000 (14:17 +0200)]
mips: add assembler flags for mips32r2 ISA and mhard-float
For some compilers ISA older than mips32r2 is set as default.
Because of them assembler flag "-mips32r2" needs to be added
for CPUs that support mips32r2 ISA in part of configure script
where ISA capabilities are checked.
"-mhard-float" assembler flag is also added for CPUs that have FPU.
Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Tue, 14 Aug 2012 16:51:05 +0000 (18:51 +0200)]
vf_yadif: fix permissions.
Require AV_PERM_PRESERVE and leave harmless permissions
alone for the next filter.
Nicolas George [Tue, 14 Aug 2012 16:50:23 +0000 (18:50 +0200)]
vf_tinterlace: leave harmless permissions alone.
Nicolas George [Tue, 14 Aug 2012 16:49:58 +0000 (18:49 +0200)]
vf_thumbnail: fix permissions.
Nicolas George [Tue, 14 Aug 2012 16:49:17 +0000 (18:49 +0200)]
vf_select: require AV_PERM_PRESERVE.
This is only necessary because of the poll_frame implementation.
Removing it altogether would be another solution.
Nicolas George [Tue, 14 Aug 2012 16:48:22 +0000 (18:48 +0200)]
vf_removelogo: fix permissions.
The branch with the test was already impossible.
Nicolas George [Tue, 14 Aug 2012 16:46:49 +0000 (18:46 +0200)]
vf_overlay: fix permissions.
Nicolas George [Tue, 14 Aug 2012 16:45:30 +0000 (18:45 +0200)]
vf_idet: fix permissions.
Only write needs to be removed, other can be left.
Nicolas George [Tue, 14 Aug 2012 16:45:00 +0000 (18:45 +0200)]
vf_fps: fix permissions.
Nicolas George [Tue, 14 Aug 2012 16:44:38 +0000 (18:44 +0200)]
vf_fieldorder: fix permissions.
Nicolas George [Tue, 14 Aug 2012 16:44:12 +0000 (18:44 +0200)]
vf_fade: fix permissions.
Nicolas George [Tue, 14 Aug 2012 16:42:51 +0000 (18:42 +0200)]
vf_drawtext: fix permissions.
Nicolas George [Tue, 14 Aug 2012 16:42:36 +0000 (18:42 +0200)]
vf_drawtext: fix permissions.
Nicolas George [Tue, 14 Aug 2012 16:42:12 +0000 (18:42 +0200)]
vf_deshake: fix permissions.
Nicolas George [Tue, 14 Aug 2012 16:41:49 +0000 (18:41 +0200)]
vf_delogo: fix permissions.
Nicolas George [Tue, 14 Aug 2012 16:41:29 +0000 (18:41 +0200)]
vf_colormatrix: fix permissions.
Nicolas George [Tue, 14 Aug 2012 16:41:03 +0000 (18:41 +0200)]
vf_ass: fix permissions.
Nicolas George [Tue, 14 Aug 2012 16:40:34 +0000 (18:40 +0200)]
vf_alphamerge: fix permissions.
Nicolas George [Tue, 14 Aug 2012 16:40:05 +0000 (18:40 +0200)]
avf_concat: fix permissions.
Nicolas George [Tue, 14 Aug 2012 16:39:39 +0000 (18:39 +0200)]
af_channelmap: fix permissions.
Nicolas George [Tue, 14 Aug 2012 16:39:08 +0000 (18:39 +0200)]
af_channelmap: require AV_PERM_PRESERVE.
Nicolas George [Tue, 14 Aug 2012 16:38:05 +0000 (18:38 +0200)]
fifo: fix permissions.
Nicolas George [Tue, 14 Aug 2012 16:37:15 +0000 (18:37 +0200)]
split: set rej_perms = AV_PERM_WRITE on outputs.
Nicolas George [Tue, 14 Aug 2012 16:36:19 +0000 (18:36 +0200)]
sink_buffer: require AV_PERM_PRESERVE.
Nicolas George [Tue, 14 Aug 2012 16:35:50 +0000 (18:35 +0200)]
lavfi: grant all permissions on mallocated audio buffers.
The permissions not requested by the filter that created
the buffer may be useful for a later filter and avoid a copy.
Nicolas George [Tue, 14 Aug 2012 16:52:43 +0000 (18:52 +0200)]
lavfi: fix erroneous use of AV_PERM_PRESERVE in ff_inplace_start_frame.
ff_inplace_start_frame looks useless anyway.
Nicolas George [Tue, 14 Aug 2012 16:34:36 +0000 (18:34 +0200)]
lavfi: grant all permissions on mallocated video buffers.
The permissions not requested by the filter that created
the buffer may be useful for a later filter and avoid a copy.
Michael Niedermayer [Fri, 17 Aug 2012 15:06:07 +0000 (17:06 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libvpxenc: use the default bitrate if not set
utvideo: Rename utvideo.c to utvideodec.c
doc: Fix syntax errors in sample Emacs config
mjpegdec: more meaningful return values
configure: clean up Altivec detection
getopt: Remove an unnecessary define
rtmp: Use int instead of ssize_t
getopt: Add missing includes
rtmp: Add support for receiving incoming streams
Add missing includes for code relying on external libraries
Conflicts:
libavcodec/libopenjpegenc.c
libavcodec/libvpxenc.c
libavcodec/mjpegdec.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Thu, 16 Aug 2012 18:00:53 +0000 (20:00 +0200)]
libvpxenc: use the default bitrate if not set
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Jan Ekström [Fri, 17 Aug 2012 10:33:52 +0000 (13:33 +0300)]
utvideo: Rename utvideo.c to utvideodec.c
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Jordi Ortiz [Wed, 15 Aug 2012 15:58:01 +0000 (17:58 +0200)]
doc: Fix syntax errors in sample Emacs config
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Clément Bœsch [Fri, 17 Aug 2012 06:07:37 +0000 (08:07 +0200)]
lavfi/edgedetect: add rounding for high/low threshold.
This should fix the 32-bit FATE instances where low_u8=19 and high_u8=49.
Michael Niedermayer [Fri, 17 Aug 2012 05:16:16 +0000 (07:16 +0200)]
escape124: Fix long == 64 assumtation.
Found-by: Nicolas
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 17 Aug 2012 00:58:41 +0000 (02:58 +0200)]
ccitt fax: fix some group3 1d files without EOL
Fixes Ticket832
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Thu, 16 Aug 2012 21:24:15 +0000 (23:24 +0200)]
mjpegdec: more meaningful return values
Mans Rullgard [Wed, 15 Aug 2012 23:10:33 +0000 (00:10 +0100)]
configure: clean up Altivec detection
There used to be one test for Altivec intrinsics support and a
separate test to determine which of two possible syntaxes to use
for vector literals. Since 2008, we only support the more common
of these so the split test no longer makes sense.
This combines the tests into one and also changes the hard error on
failure to a warning. The test can reasonably fail if no --cpu flag
is provided (or is provided with an unknown CPU) and the compiler
default target does not support Altivec. Aborting in this case is
probably over-reacting.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Thu, 16 Aug 2012 20:28:29 +0000 (22:28 +0200)]
escape124: fix integer overflow leading to excessive memory allocation
Fixes Ticket1629
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 16 Aug 2012 19:14:52 +0000 (22:14 +0300)]
getopt: Remove an unnecessary define
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 16 Aug 2012 19:30:10 +0000 (21:30 +0200)]
deprecate av_parse_cpu_flags
This function is problematic in several ways, its also quite
unpredictable which flags it ends up turning on
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 16 Aug 2012 19:28:31 +0000 (21:28 +0200)]
av_parse_cpu_caps: add "mmxext" as alias for mmx2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 16 Aug 2012 19:28:05 +0000 (21:28 +0200)]
fft-test: switch to new cpu flags API
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Thu, 26 Jul 2012 17:45:53 +0000 (19:45 +0200)]
lavfi: add edgedetect filter.
Martin Storsjö [Thu, 16 Aug 2012 19:11:13 +0000 (22:11 +0300)]
rtmp: Use int instead of ssize_t
Not all compilers support ssize_t (MSVC doesn't), and none of these
variables need to be larger than 32 bit.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 16 Aug 2012 12:04:27 +0000 (15:04 +0300)]
getopt: Add missing includes
Signed-off-by: Martin Storsjö <martin@martin.st>
Nicolas George [Thu, 16 Aug 2012 16:17:29 +0000 (18:17 +0200)]
lavfi/movie: extend a doxygen comment.
Giorgio Vazzana [Thu, 16 Aug 2012 12:35:41 +0000 (14:35 +0200)]
libswscale: fix #endif comments in rgb2rgb_template.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Tue, 14 Aug 2012 09:08:48 +0000 (11:08 +0200)]
lavfi/movie: set pkt->stream_index for flushing.
Otherwise, the value of stream_index is kept from the last packet
read, which is not necessarily the stream that needs flushing.
Michael Niedermayer [Thu, 16 Aug 2012 15:29:29 +0000 (17:29 +0200)]
vc1dsp_mmx: remove libavutil/internal.h include
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 16 Aug 2012 15:28:57 +0000 (17:28 +0200)]
simple_idct_mmx: remove libavutil/internal.h include
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 16 Aug 2012 15:28:37 +0000 (17:28 +0200)]
x86/motion_est_mmx: remove libavutil/internal.h include
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 16 Aug 2012 15:28:13 +0000 (17:28 +0200)]
x86/mlpdsp: remove libavutil/internal.h include
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>