]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Fri, 3 May 2013 12:58:28 +0000 (14:58 +0200)]
ffmpeg: fix the used maximum dts in the monotone dts workaround
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 12:57:05 +0000 (14:57 +0200)]
ffmpeg: use a max variable to hold the maximum dts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 12:54:13 +0000 (14:54 +0200)]
ffmpeg: Check dts before use in non monotone dts workaround
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 12:53:18 +0000 (14:53 +0200)]
ffmpeg: limit non monotone workaround to audio & video streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 12:52:37 +0000 (14:52 +0200)]
ffmpeg: move non monotone prevention code down
This moves the code to after the bitstream filters
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 12:17:54 +0000 (14:17 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: do not send non-monotonous DTS to the muxers.
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 11:53:08 +0000 (13:53 +0200)]
Merge commit '
b4a5a292274f904f404f40f826c51e6fc9cfb8fe '
* commit '
b4a5a292274f904f404f40f826c51e6fc9cfb8fe ':
avconv: improve -re implementation
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 11:16:34 +0000 (13:16 +0200)]
Merge commit '
e3b225a4fe0ff1e64a220b757c6f0a5cf9258521 '
* commit '
e3b225a4fe0ff1e64a220b757c6f0a5cf9258521 ':
matroskaenc: add an option to put the index at the start of the file
Conflicts:
doc/muxers.texi
libavformat/matroskaenc.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 11:09:23 +0000 (13:09 +0200)]
Merge commit '
0574bc06d23a6690a16c5926dddc9be359a3d7bb '
* commit '
0574bc06d23a6690a16c5926dddc9be359a3d7bb ':
matroskaenc: cosmetics, reorder the #includes
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 10:58:52 +0000 (12:58 +0200)]
Merge commit '
accde1bd8756936e1757b42fc9bad2eb5d192f8a '
* commit '
accde1bd8756936e1757b42fc9bad2eb5d192f8a ':
vc1_parser: Set field_order.
mpegvideo_parser: Set field_order.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 10:15:01 +0000 (12:15 +0200)]
Merge commit '
507b1e454cf9953da3e18f33c9bd1fca78c97cb5 '
* commit '
507b1e454cf9953da3e18f33c9bd1fca78c97cb5 ':
avcodec: Add field order information to AVCodecParserContext.
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 09:57:59 +0000 (11:57 +0200)]
Merge commit '
566b7a20fd0cab44d344329538d314454a0bcc2f '
* commit '
566b7a20fd0cab44d344329538d314454a0bcc2f ':
x86: float dsp: butterflies_float SSE
Conflicts:
libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 09:41:48 +0000 (11:41 +0200)]
Merge commit '
b333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44 '
* commit '
b333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44 ':
lavf-regression: use -frames instead of -t for image tests
Conflicts:
tests/lavf-regression.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 09:32:04 +0000 (11:32 +0200)]
avcodec: move lowres down with the next ABI bump and add accessors
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 09:30:00 +0000 (11:30 +0200)]
Merge commit '
803d21f38bdafe7c4e2571a9ae7052013a12923b '
* commit '
803d21f38bdafe7c4e2571a9ae7052013a12923b ':
lavc: schedule AVCodecContext.lowres for removal on next bump.
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 09:16:54 +0000 (11:16 +0200)]
Merge commit '
ffb068ce8e99df121d18a5b9b1d820f3ea8697fb '
* commit '
ffb068ce8e99df121d18a5b9b1d820f3ea8697fb ':
configure: Don't do enable_deep_weak on disabled variables
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 09:11:36 +0000 (11:11 +0200)]
Merge commit '
4d810ad2e943a59658ddf00a397121c2b62f7157 '
* commit '
4d810ad2e943a59658ddf00a397121c2b62f7157 ':
configure: Use a different variable name in push/popvar
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 09:06:27 +0000 (11:06 +0200)]
Merge commit '
13f57a4d881ec669b87bf82f424bfff502433060 '
* commit '
13f57a4d881ec669b87bf82f424bfff502433060 ':
wav: K&R formatting cosmetics
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 08:55:43 +0000 (10:55 +0200)]
Merge commit '
6b753015ca6f93d16a05e1a97da1fa42e4da60ec '
* commit '
6b753015ca6f93d16a05e1a97da1fa42e4da60ec ':
aac: Remove aacpsy.h header, unused since
78e65cd7726
cavs: Remove cavsdata.h header, unused since
88386feefd
Conflicts:
libavcodec/aacpsy.h
libavcodec/cavsdata.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 08:49:46 +0000 (10:49 +0200)]
Merge commit '
bf7c3c6b157f7938578f964b62cffd5e504940be '
* commit '
bf7c3c6b157f7938578f964b62cffd5e504940be ':
x86: dsputil: Move cavs and vc1-specific functions where they belong
Conflicts:
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 08:43:52 +0000 (10:43 +0200)]
Merge commit '
932806232108872655556100011fe369125805d3 '
* commit '
932806232108872655556100011fe369125805d3 ':
x86: dsputil: Move avg_pixels16_mmx() out of rnd_template.c
x86: dsputil: Move avg_pixels8_mmx() out of rnd_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 3 May 2013 08:30:37 +0000 (10:30 +0200)]
Merge commit '
9b3a04d30691e85b77e63f75f5f26a93c3a000cd '
* commit '
9b3a04d30691e85b77e63f75f5f26a93c3a000cd ':
x86: Move duplicated put_pixels{8|16}_mmx functions into their own file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 24 Apr 2013 06:34:44 +0000 (08:34 +0200)]
avconv: do not send non-monotonous DTS to the muxers.
Hack partially based on a commit by Michael Niedermayer <michaelni@gmx.at>
Should fix (or work around) bug 458.
Anton Khirnov [Tue, 23 Apr 2013 18:34:59 +0000 (20:34 +0200)]
avconv: improve -re implementation
Integrate the code in the packet reading function, instead of inserting
sleeps in many places.
This is simpler to follow and should work better.
Anton Khirnov [Tue, 30 Apr 2013 06:36:20 +0000 (08:36 +0200)]
matroskaenc: add an option to put the index at the start of the file
Anton Khirnov [Tue, 30 Apr 2013 05:52:50 +0000 (07:52 +0200)]
matroskaenc: cosmetics, reorder the #includes
Masaki Tanaka [Tue, 9 Apr 2013 07:44:40 +0000 (16:44 +0900)]
vc1_parser: Set field_order.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Masaki Tanaka [Tue, 9 Apr 2013 07:43:08 +0000 (16:43 +0900)]
mpegvideo_parser: Set field_order.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Masaki Tanaka [Tue, 9 Apr 2013 07:39:34 +0000 (16:39 +0900)]
avcodec: Add field order information to AVCodecParserContext.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Christophe Gisquet [Fri, 12 Apr 2013 19:07:01 +0000 (21:07 +0200)]
x86: float dsp: butterflies_float SSE
97c -> 49c
Some codecs could benefit from more unrolling, but AAC doesn't.
Anton Khirnov [Thu, 2 May 2013 07:39:18 +0000 (09:39 +0200)]
lavf-regression: use -frames instead of -t for image tests
-t 0.5 is 12.5 frames at 25 fps, which may round to either 12 or 13 on
different platforms.
Anton Khirnov [Tue, 30 Apr 2013 10:17:33 +0000 (12:17 +0200)]
lavc: schedule AVCodecContext.lowres for removal on next bump.
It has been deprecated some time ago, but was forgotten during the last
bump.
highgod0401 [Fri, 3 May 2013 01:24:43 +0000 (09:24 +0800)]
lavu/opencl: fix the compile bug on linux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 2 May 2013 22:26:35 +0000 (00:26 +0200)]
fate: Adjust filter-trim-time parameters
This should workaround rounding differences between platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 2 May 2013 20:06:03 +0000 (22:06 +0200)]
mmvideo/mm_decode_intra: check horizontal coordinate too
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 2 May 2013 19:52:08 +0000 (21:52 +0200)]
mmvideo/mm_decode_inter: check horizontal coordinate too
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Wed, 3 Apr 2013 12:55:14 +0000 (15:55 +0300)]
configure: Don't do enable_deep_weak on disabled variables
This avoids cases where configure tries to weakly enable an item
which actually is disabled, ending up still enabling dependencies
of the item which itself is only enabled weakly.
More concretely, the h264 decoder suggests error resilience, which
is then enabled weakly (unless manually disabled). Previously,
dsputil, which is a dependency of error resilience, was enabled
even if error resilience wasn't enabled in the end.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 3 Apr 2013 12:52:45 +0000 (15:52 +0300)]
configure: Use a different variable name in push/popvar
The variable name 'var' is commonly used to iterate through arguments
in other functions. When the pushvar function internally uses the
variable 'var', it makes pushing/popping the variable 'var' not
work as intended.
Signed-off-by: Martin Storsjö <martin@martin.st>
Luca Barbato [Thu, 2 May 2013 09:42:09 +0000 (11:42 +0200)]
wav: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Thu, 2 May 2013 16:44:22 +0000 (18:44 +0200)]
nutdec: Implement duration parsing for indexed nuts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 2 May 2013 14:55:59 +0000 (16:55 +0200)]
aac: Remove aacpsy.h header, unused since
78e65cd7726
Diego Biurrun [Thu, 2 May 2013 14:46:51 +0000 (16:46 +0200)]
cavs: Remove cavsdata.h header, unused since
88386feefd
Michael Niedermayer [Thu, 2 May 2013 15:24:02 +0000 (17:24 +0200)]
ape_decode_value_3860: check k before using it in get_bits()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 2 May 2013 14:45:06 +0000 (16:45 +0200)]
ape_decode_value_3900: check tmpk
Fixes division by 0
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 2 May 2013 14:01:28 +0000 (16:01 +0200)]
ffmpeg: fix segfault with random output
Found-by: <durandal_1707>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
highgod0401 [Thu, 2 May 2013 04:52:04 +0000 (12:52 +0800)]
lavu/opencl: fix bug of opencl options
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 2 May 2013 12:15:39 +0000 (12:15 +0000)]
lavfi/blend: merge config_input_top into config_output
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 2 May 2013 12:09:28 +0000 (12:09 +0000)]
lavfi/blend: use correct way to check number of planes
This fix crash with gray, as its marked as pseudopal,
and thus have extra plane.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 27 Apr 2013 22:49:14 +0000 (00:49 +0200)]
avutil/mem: add av_memdup()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 2 May 2013 10:50:03 +0000 (10:50 +0000)]
vmdav: unbreak decoding of samples from game The Last Dynasty
This fixes video output with samples HG060808.VMD and
HG060810.VMD. Regression since
c0cbe36b18ab3e .
While here show warning if decoding is aborted for some reason.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 2 May 2013 09:58:53 +0000 (09:58 +0000)]
vmdav: return meaningful error codes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 2 May 2013 11:01:58 +0000 (13:01 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Add wmv2 dependency to vc1 compilation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 2 May 2013 10:47:44 +0000 (12:47 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
id3v2: K&R formatting cosmetics
ppc: Only compile AltiVec FFT assembly when AltiVec is enabled
Conflicts:
libavformat/id3v2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sat, 27 Apr 2013 20:54:57 +0000 (22:54 +0200)]
x86: dsputil: Move cavs and vc1-specific functions where they belong
Diego Biurrun [Sat, 27 Apr 2013 20:52:26 +0000 (22:52 +0200)]
x86: dsputil: Move avg_pixels16_mmx() out of rnd_template.c
The function does not do any rounding, so there is no point in
keeping it in a round template file.
Diego Biurrun [Sat, 27 Apr 2013 20:01:07 +0000 (22:01 +0200)]
x86: dsputil: Move avg_pixels8_mmx() out of rnd_template.c
The function is only instantiated once, so there is no point
in keeping it in a template file.
Diego Biurrun [Tue, 23 Apr 2013 15:10:59 +0000 (17:10 +0200)]
x86: Move duplicated put_pixels{8|16}_mmx functions into their own file
Carl Eugen Hoyos [Thu, 2 May 2013 09:04:57 +0000 (11:04 +0200)]
Add wmv2 dependency to vc1 compilation.
Fixes compilation with --disable-everything --enable-decoder=vc1.
Luca Barbato [Wed, 1 May 2013 17:11:54 +0000 (19:11 +0200)]
id3v2: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Tue, 30 Apr 2013 16:02:48 +0000 (18:02 +0200)]
ppc: Only compile AltiVec FFT assembly when AltiVec is enabled
Michael Niedermayer [Thu, 2 May 2013 00:16:41 +0000 (02:16 +0200)]
avcodec/ansi: Fix right/bottom end checks
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 2 May 2013 00:15:03 +0000 (02:15 +0200)]
avcodec/ansi: Check x/y
This prevents out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 21:46:38 +0000 (23:46 +0200)]
vmdav: Try to fix unpack_rle()
This fixes out of array accesses
The code prior to this commit could not have worked, thus obviously
was untested. I was also not able to find a valid sample that uses this
code.
This fix is thus only based on the description of the format
If someone has a sample that uses unpack_rle(), please mail me.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 18:16:19 +0000 (20:16 +0200)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavc: copy subtitle_header when copying context.
lavf: data muxer and demuxer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 16:33:30 +0000 (18:33 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avutil: doxy: Small clarification for av_buffer_create()
avcodec: doxy: Clarify how to use buf[] when implementing get_buffer2()
avcodec: doxy: Clarify what get_buffer2 must fill in buf[]
Conflicts:
libavutil/buffer.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 16:28:48 +0000 (18:28 +0200)]
Merge commit '
e926b5ceb1962833f0c884a328382bc2eca67aff '
* commit '
e926b5ceb1962833f0c884a328382bc2eca67aff ':
avformat: Drop unnecessary ff_ name prefixes from static functions
Conflicts:
libavformat/audiointerleave.c
libavformat/mux.c
libavformat/mxfenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 16:21:29 +0000 (18:21 +0200)]
Merge commit '
7f75f2f2bd692857c1c1ca7f414eb30ece3de93d '
* commit '
7f75f2f2bd692857c1c1ca7f414eb30ece3de93d ':
ppc: Drop unnecessary ff_ name prefixes from static functions
x86: Drop unnecessary ff_ name prefixes from static functions
arm: Drop unnecessary ff_ name prefixes from static functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 16:16:32 +0000 (18:16 +0200)]
Merge commit '
088f38a4f9f54bb923405c67c9e72d96d90aa284 '
* commit '
088f38a4f9f54bb923405c67c9e72d96d90aa284 ':
avcodec: Drop unnecessary ff_ name prefixes from static functions
Conflicts:
libavcodec/ass.c
libavcodec/h264_parser.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 16:08:13 +0000 (18:08 +0200)]
Merge commit '
38282149b6ce8f4b8361e3b84542ba9aa8a1f32f '
* commit '
38282149b6ce8f4b8361e3b84542ba9aa8a1f32f ':
ppc: More consistent arch initialization
Conflicts:
libavcodec/fft.h
libavcodec/mpegaudiodsp.c
libavcodec/mpegaudiodsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 16:02:36 +0000 (18:02 +0200)]
Merge commit '
42b9150b0d4f0a130c1d93dc991fd5412743a8cf '
* commit '
42b9150b0d4f0a130c1d93dc991fd5412743a8cf ':
fft: Remove pointless #ifdefs around function declarations
ppc: Move AltiVec utility headers out of AltiVec ifdefs
Conflicts:
libavcodec/fft.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 15:57:52 +0000 (17:57 +0200)]
Merge commit '
f5eecee865a731d2412fde2f73c29f8f8115c499 '
* commit '
f5eecee865a731d2412fde2f73c29f8f8115c499 ':
ppc: util_altivec: Surround AltiVec-related code by appropriate ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 15:53:27 +0000 (17:53 +0200)]
Merge commit '
6b110d3a739c31602b59887ad65c67025df3f49d '
* commit '
6b110d3a739c31602b59887ad65c67025df3f49d ':
ppc: More consistent names for H.264 optimizations files
mpegaudiosp: More consistent names for ppc/x86 optimization files
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 15:45:33 +0000 (17:45 +0200)]
sws: share xyzgamma tables.
They are currently always constant and thus theres no point to
store them in the context.
This makes the context 16kb smaller
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 12:35:02 +0000 (14:35 +0200)]
Merge commit '
8cd472d3f947a6233e7dc628f0dc71c74e62413a '
* commit '
8cd472d3f947a6233e7dc628f0dc71c74e62413a ':
avconv: make output -ss insert trim/atrim filters.
Conflicts:
Changelog
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 12:12:04 +0000 (14:12 +0200)]
Merge commit '
a83c0da539fb07260310bc3b34056239d2b138b2 '
* commit '
a83c0da539fb07260310bc3b34056239d2b138b2 ':
avconv: make -t insert trim/atrim filters.
The filter insertion code is merged but disabled as it is buggy.
For example it fails in various ways when used with -s with some files.
Also the trimming is arguably less accurate than the default without
filters in some cases.
These issues should be fixed before auto inserting the filters,
until then the user can explicitly add a trim/atrim filter when one is
wanted.
Conflicts:
Changelog
ffmpeg.c
ffmpeg_filter.c
tests/ref/fate/bethsoft-vid
tests/ref/lavf/aiff
tests/ref/lavf/asf
tests/ref/lavf/au
tests/ref/lavf/avi
tests/ref/lavf/dpx
tests/ref/lavf/ffm
tests/ref/lavf/gxf
tests/ref/lavf/jpg
tests/ref/lavf/mkv
tests/ref/lavf/mmf
tests/ref/lavf/mov
tests/ref/lavf/mpg
tests/ref/lavf/nut
tests/ref/lavf/ogg
tests/ref/lavf/pcx
tests/ref/lavf/png
tests/ref/lavf/rm
tests/ref/lavf/ts
tests/ref/lavf/voc
tests/ref/lavf/voc_s16
tests/ref/lavf/wav
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 11:17:48 +0000 (13:17 +0200)]
avfilter/trim: improve rounding precission
Note, the design is still flawed, dont expect this to be frame
accurate. float/double first needs to be removed and frames
itself trimmed instead of drop vs nodrop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 1 May 2013 11:13:49 +0000 (13:13 +0200)]
fate/pixfmts: use the appropriate variable names for temporary files.
${1} is now the filter args and is inappropriate as a unique name for
the test (and causes some FATE issues because of the ':' in them).
${filter} is not used either to replace the ${1} because ${outfile}
already contains a unique name for the test.
Michael Niedermayer [Wed, 1 May 2013 10:09:07 +0000 (12:09 +0200)]
Merge commit '
3d624420086ed3cd0c74f4510f0285968e21c117 '
* commit '
3d624420086ed3cd0c74f4510f0285968e21c117 ':
avconv_opt: allocate an OutputFile before the streams.
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Nicolas George [Tue, 23 Apr 2013 18:18:00 +0000 (20:18 +0200)]
lavc: copy subtitle_header when copying context.
Fix trac ticket #2489.
Nicolas George [Mon, 29 Apr 2013 18:46:00 +0000 (20:46 +0200)]
lavf: data muxer and demuxer.
Allow to use tools designed to work with demuxers, muxers
and packets (for example ffmpeg itself) to process raw byte
streams (like aviocat).
Michael Niedermayer [Wed, 1 May 2013 09:26:53 +0000 (11:26 +0200)]
Merge commit '
a1e05b0487a1939334c2920fc7f9936bc9efe876 '
* commit '
a1e05b0487a1939334c2920fc7f9936bc9efe876 ':
lavfi: add trim and atrim filters.
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 08:59:21 +0000 (10:59 +0200)]
Merge commit '
b472938233b98178ed6c1353c37e0dc7ab585902 '
* commit '
b472938233b98178ed6c1353c37e0dc7ab585902 ':
lavfi: add an asetpts filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/f_setpts.c
libavfilter/setpts.c
libavfilter/version.h
libavfilter/vf_setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 08:24:45 +0000 (10:24 +0200)]
Merge commit '
2548834b2248ad4d7da9bd0afed09d7d0cddeeb0 '
* commit '
2548834b2248ad4d7da9bd0afed09d7d0cddeeb0 ':
vf_setpts: cosmetics, reformat
Conflicts:
libavfilter/f_setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 08:16:27 +0000 (10:16 +0200)]
Merge commit '
c22263d3e813d442df8fa5f5ba8993573fe775d8 '
* commit '
c22263d3e813d442df8fa5f5ba8993573fe775d8 ':
graphparser: only print filter arguments if they are non-NULL
af_channelmap: ensure the output channel layout is valid.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 08:11:01 +0000 (10:11 +0200)]
Merge commit '
949c603ed9210df0e1b8e1aa82c71b93543d8071 '
* commit '
949c603ed9210df0e1b8e1aa82c71b93543d8071 ':
af_channelmap: remove now unnecessary goto
vf_split: fix description
Conflicts:
libavfilter/split.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 07:59:57 +0000 (09:59 +0200)]
Merge commit '
e036bb7899d0faca9159206be9bf5552e76e7633 '
* commit '
e036bb7899d0faca9159206be9bf5552e76e7633 ':
lavc: clear AVBuffers on decoded frames if refcounted_frames is not set
FATE: add an additional indeo3 test
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 07:51:37 +0000 (09:51 +0200)]
Merge commit '
bda9e6d923df6d46cc5cafb30a59a01d2514fa61 '
* commit '
bda9e6d923df6d46cc5cafb30a59a01d2514fa61 ':
indeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell()
Conflicts:
libavcodec/indeo3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 1 May 2013 07:45:04 +0000 (09:45 +0200)]
Merge commit '
95220be1faac628d849a004644c0d102df0aa98b '
* commit '
95220be1faac628d849a004644c0d102df0aa98b ':
indeo3: fix off by one in MV validity check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 1 May 2013 02:46:12 +0000 (04:46 +0200)]
doc/filters: fix scale example equivalence.
scale=w=200:h=100 and scale=w=200:h=100 are of course equivalent...
Clément Bœsch [Wed, 1 May 2013 02:44:23 +0000 (04:44 +0200)]
doc/filters: replace hqdn3d with smartblur in timeline section.
hqdn3d needs some adjustements before timeline support can be restored
(patch welcome).
Michael Niedermayer [Tue, 30 Apr 2013 21:51:30 +0000 (23:51 +0200)]
h264: Use the correct croping values.
This fixes returning pictures with corrupted data pointers.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Apr 2013 21:49:56 +0000 (23:49 +0200)]
h264: assert that croping values at slice level are consistent
These values where checked before already.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Apr 2013 21:48:53 +0000 (23:48 +0200)]
h264_ps: check croping values
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Apr 2013 18:05:31 +0000 (20:05 +0200)]
avutil/log: Fix context pointer used for get_category()
Fixes calling a random pointer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Mon, 29 Apr 2013 02:23:45 +0000 (22:23 -0400)]
avutil: doxy: Small clarification for av_buffer_create()
Explicitly saying it can't hurt.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Mon, 29 Apr 2013 02:15:34 +0000 (22:15 -0400)]
avcodec: doxy: Clarify how to use buf[] when implementing get_buffer2()
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Mon, 29 Apr 2013 02:13:21 +0000 (22:13 -0400)]
avcodec: doxy: Clarify what get_buffer2 must fill in buf[]
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diego Biurrun [Sat, 20 Apr 2013 19:47:15 +0000 (21:47 +0200)]
avformat: Drop unnecessary ff_ name prefixes from static functions
Diego Biurrun [Sat, 20 Apr 2013 19:48:29 +0000 (21:48 +0200)]
ppc: Drop unnecessary ff_ name prefixes from static functions
Diego Biurrun [Sat, 20 Apr 2013 20:15:22 +0000 (22:15 +0200)]
x86: Drop unnecessary ff_ name prefixes from static functions