]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Thu, 28 Mar 2013 12:23:12 +0000 (13:23 +0100)]
Merge commit '
1a6d4bd7b60761bd7d955011ce7df4dd6b87b497 '
* commit '
1a6d4bd7b60761bd7d955011ce7df4dd6b87b497 ':
FATE: add a test for the fade filter
FATE: add a test for the drawbox filter
FATE: add a test for the boxblur filter
FATE: add a test for the gradfun filter
Conflicts:
tests/fate/filter.mak
tests/ref/fate/filter-gradfun
our gradfun test is renamed to gradfun-ubitux as its name conflicts and
it was requested to be kept. Feel free to rename, change, finetune ...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Mar 2013 12:00:39 +0000 (13:00 +0100)]
Merge commit '
1ae44c87c924b69a0657256fbaa8ad140df2f27c '
* commit '
1ae44c87c924b69a0657256fbaa8ad140df2f27c ':
lavfi/gradfun: remove rounding to match C and SSE code.
lavfi/gradfun: fix dithering in MMX code.
lavfi/gradfun: fix rounding in MMX code.
lavfi/gradfun: do not increment DC pointer for odd values.
fate: filter: Add dependencies
avconv: add options for reading filtergraphs from a file.
Conflicts:
Changelog
doc/ffmpeg.texi
doc/filters.texi
ffmpeg.h
ffmpeg_opt.c
libavfilter/vf_gradfun.c
tests/fate/filter.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 28 Mar 2013 11:52:11 +0000 (11:52 +0000)]
lavfi/biquads: fix min allowed option value
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 28 Mar 2013 11:26:36 +0000 (12:26 +0100)]
Merge commit '
cf53704c55378cc0dcfc16637cdac7d58f0b3107 '
* commit '
cf53704c55378cc0dcfc16637cdac7d58f0b3107 ':
AVOptions: make av_set_options_string() forward options to child objects
win32: Use 64-bit fstat/lseek variants for MSVC as well
win32: Make ff_win32_open more robust
Conflicts:
libavformat/os_support.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Mar 2013 11:20:41 +0000 (12:20 +0100)]
Merge commit '
e9cc98839574c7e8d546e890ebbf57d1766e5d8a '
* commit '
e9cc98839574c7e8d546e890ebbf57d1766e5d8a ':
win32: Allow other programs to open the same files
configure: Add error_resilience as dependency to the eatqi decoder
Conflicts:
configure
libavformat/os_support.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Mar 2013 11:12:31 +0000 (12:12 +0100)]
Merge commit '
472391b9a7e15e3bff33b016e7b6dbfa6a555975 '
* commit '
472391b9a7e15e3bff33b016e7b6dbfa6a555975 ':
ape: use correct context for the bit table printed in debug
build: Move setting of SRC_DIR to the only place it is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Mar 2013 11:04:53 +0000 (12:04 +0100)]
Merge commit '
b4d24b471bc52f1f78a43ee330199e70483e51c3 '
* commit '
b4d24b471bc52f1f78a43ee330199e70483e51c3 ':
build: Remove configure-generated .config file on distclean
msmpeg4: Split decoding related functions to a separate file
Conflicts:
Makefile
libavcodec/Makefile
libavcodec/msmpeg4.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Mar 2013 10:56:05 +0000 (11:56 +0100)]
Merge commit '
e557584aa7df6ac9f52af7ee7e5c963437da2e2f '
* commit '
e557584aa7df6ac9f52af7ee7e5c963437da2e2f ':
mpeg12: Move Mpeg1Context declaration to the only place it is used
Conflicts:
libavcodec/mpeg12.h
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Mar 2013 10:45:04 +0000 (11:45 +0100)]
Merge commit '
1b6d66745ac1768adb387c2227cdcf4452271149 '
* commit '
1b6d66745ac1768adb387c2227cdcf4452271149 ':
Split MPEG-1/2 decoder code off from MPEG-1/2 common code
Conflicts:
libavcodec/Makefile
libavcodec/mpeg12.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Mar 2013 10:30:21 +0000 (11:30 +0100)]
Merge commit '
eee2000b41234ae9465c314e18bfec1700181f32 '
* commit '
eee2000b41234ae9465c314e18bfec1700181f32 ':
mpeg12: Move some ff_mpeg1_* function declarations to a more suitable place
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Mar 2013 10:20:41 +0000 (11:20 +0100)]
Merge commit '
b6649ab5037fb55f78c2606f3d23cea0867cdeaa '
* commit '
b6649ab5037fb55f78c2606f3d23cea0867cdeaa ':
cosmetics: Remove unnecessary extern keywords from function declarations
Conflicts:
libswscale/x86/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Mar 2013 10:11:00 +0000 (11:11 +0100)]
Merge commit '
1db6a080bddd14fed6b29140ecd2e21e42b1c022 '
* commit '
1db6a080bddd14fed6b29140ecd2e21e42b1c022 ':
dca: Move ff_dca_convert_bitstream() to the DCA common code
vdpau: wrap codec specific functions in appropiate #ifs
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Mar 2013 10:07:07 +0000 (11:07 +0100)]
Merge commit '
757d85868b77c4fdec7b77a3b7de1faf16c031e8 '
* commit '
757d85868b77c4fdec7b77a3b7de1faf16c031e8 ':
vdpau: fix obsolete mpeg1 vdpau decoder when mpeg2 is disabled
Conflicts:
libavcodec/mpeg12.c
Nothing changes as the buggy code is not in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Mar 2013 09:53:50 +0000 (10:53 +0100)]
Merge commit '
d767e2f969933b4e450ed4e69ea2bf8ca864838c '
* commit '
d767e2f969933b4e450ed4e69ea2bf8ca864838c ':
configure: fix dependencies of XvMC and old vdpau mpeg2 decoders
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Wed, 13 Mar 2013 10:03:08 +0000 (11:03 +0100)]
FATE: add a test for the fade filter
Anton Khirnov [Wed, 13 Mar 2013 10:03:08 +0000 (11:03 +0100)]
FATE: add a test for the drawbox filter
Anton Khirnov [Wed, 13 Mar 2013 10:03:08 +0000 (11:03 +0100)]
FATE: add a test for the boxblur filter
Anton Khirnov [Wed, 13 Mar 2013 10:03:08 +0000 (11:03 +0100)]
FATE: add a test for the gradfun filter
Clément Bœsch [Thu, 6 Dec 2012 23:41:04 +0000 (00:41 +0100)]
lavfi/gradfun: remove rounding to match C and SSE code.
There is no noticable benefit for such precision.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Clément Bœsch [Thu, 6 Dec 2012 23:39:31 +0000 (00:39 +0100)]
lavfi/gradfun: fix dithering in MMX code.
Current dithering only uses the first 4 instead of the whole 8 random values.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Clément Bœsch [Thu, 6 Dec 2012 23:36:29 +0000 (00:36 +0100)]
lavfi/gradfun: fix rounding in MMX code.
Current code divides before increasing precision.
Also reduce upper bound for strength from 255 to 64. This will prevent
an overflow in the SSSE3 and MMX filter_line code: delta is expressed as
an u16 being shifted by 2 to the left. If it overflows, having a
strength not above 64 will make sure that m is set to 0 (making the
m*m*delta >> 14 expression void).
A value above 64 should not make any sense unless gradfun is used as
a blur filter.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Clément Bœsch [Wed, 5 Dec 2012 03:58:03 +0000 (04:58 +0100)]
lavfi/gradfun: do not increment DC pointer for odd values.
First DC is only used once otherwise. This also makes the code
consistent with ASM versions.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diego Biurrun [Sat, 1 Dec 2012 19:38:26 +0000 (20:38 +0100)]
fate: filter: Add dependencies
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Wed, 13 Mar 2013 13:24:45 +0000 (14:24 +0100)]
avconv: add options for reading filtergraphs from a file.
Anton Khirnov [Tue, 12 Mar 2013 17:23:27 +0000 (18:23 +0100)]
AVOptions: make av_set_options_string() forward options to child objects
Michael Niedermayer [Thu, 28 Mar 2013 02:53:08 +0000 (03:53 +0100)]
mlpdec: Fix reading state with 0 bit elements.
This fixes an assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Mar 2013 02:16:01 +0000 (03:16 +0100)]
h264_cavlc: fix assertion failure due to reading too long vlc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Mar 2013 00:43:55 +0000 (01:43 +0100)]
estimate_timings_from_bit_rate: Check timebase and bitrate
Fixes integer overflow and assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Mar 2013 00:08:24 +0000 (01:08 +0100)]
electronicarts: check timebase, fix assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Mar 2013 23:49:02 +0000 (00:49 +0100)]
vp3: Check fps validity more completely
Fix assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Mar 2013 23:23:23 +0000 (00:23 +0100)]
wavpack: check K, fix assertion failure
Instead of this it would be possible to change the code to support
larger K but that would make the code slower and probably still need
checks on K.
This variant is choosen as there are no known valid files that need
larger K
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dale Curtis [Tue, 26 Mar 2013 21:12:30 +0000 (14:12 -0700)]
Fix heap-buffer-overflow in matroska_parse_block
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Mar 2013 21:55:49 +0000 (22:55 +0100)]
snow: drop commented out asserts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Mar 2013 21:53:57 +0000 (22:53 +0100)]
avformat: change some seeking related assert to av_asserts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Mar 2013 18:24:21 +0000 (19:24 +0100)]
vsrc_mandelbrot: Mandel morphing support
Example: ffplay -f lavfi "mandelbrot=outer=outz:morphamp=1:end_scale=2:maxiter=100"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Tue, 12 Mar 2013 15:45:13 +0000 (16:45 +0100)]
win32: Use 64-bit fstat/lseek variants for MSVC as well
Signed-off-by: Martin Storsjö <martin@martin.st>
Reimar Döffinger [Sun, 10 Mar 2013 19:03:19 +0000 (20:03 +0100)]
win32: Make ff_win32_open more robust
- Make MultiByteToWideChar fail when it encounters invalid encoding.
Without this, invalid characters might just be skipped
- When MultiByteToWideChar fails, assume the file name is in CP_ACP
and open it via normal open function, even when the file will be
written
- When malloc fails return error instead of crashing
Signed-off-by: Martin Storsjö <martin@martin.st>
Reimar Döffinger [Fri, 20 Jan 2012 19:27:22 +0000 (20:27 +0100)]
win32: Allow other programs to open the same files
In order to match Linux behaviour better our Windows-specific
open() replacement should disable Windows default file locking.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 26 Mar 2013 09:04:08 +0000 (11:04 +0200)]
configure: Add error_resilience as dependency to the eatqi decoder
This makes standalone compilation of the eatqi decoder
succeed. The dependency comes from the shared mpeg12dec.o file.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 27 Mar 2013 15:19:50 +0000 (16:19 +0100)]
mandelbrot: add outer coloring method showing bailouted z
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kostya Shishkov [Wed, 27 Mar 2013 07:57:08 +0000 (08:57 +0100)]
ape: use correct context for the bit table printed in debug
Michael Niedermayer [Wed, 27 Mar 2013 15:00:18 +0000 (16:00 +0100)]
vsrc_mandelbrot: support coloring the outside white
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 25 Mar 2013 10:52:52 +0000 (11:52 +0100)]
build: Remove configure-generated .config file on distclean
Diego Biurrun [Fri, 1 Mar 2013 18:52:32 +0000 (19:52 +0100)]
build: Move setting of SRC_DIR to the only place it is used
Martin Storsjö [Tue, 26 Mar 2013 13:48:24 +0000 (15:48 +0200)]
msmpeg4: Split decoding related functions to a separate file
This fixes standalone compilation of the msmpeg4v2, msmpeg4v3
and wmv2 encoders, that previously failed to link due to the
decoder codepaths requiring error_resilience.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diego Biurrun [Tue, 26 Mar 2013 18:52:21 +0000 (19:52 +0100)]
mpeg12: Move Mpeg1Context declaration to the only place it is used
Diego Biurrun [Tue, 26 Mar 2013 18:50:40 +0000 (19:50 +0100)]
Split MPEG-1/2 decoder code off from MPEG-1/2 common code
Diego Biurrun [Tue, 26 Mar 2013 17:25:01 +0000 (18:25 +0100)]
mpeg12: Move some ff_mpeg1_* function declarations to a more suitable place
Diego Biurrun [Tue, 26 Mar 2013 17:41:24 +0000 (18:41 +0100)]
cosmetics: Remove unnecessary extern keywords from function declarations
Diego Biurrun [Tue, 26 Mar 2013 17:17:57 +0000 (18:17 +0100)]
dca: Move ff_dca_convert_bitstream() to the DCA common code
This makes the DCA parser and decoder independent.
Janne Grunau [Tue, 26 Mar 2013 21:47:29 +0000 (22:47 +0100)]
vdpau: wrap codec specific functions in appropiate #ifs
Fixes linking when only a subset of the deprecated vdpau decoders is
enabled.
Michael Niedermayer [Wed, 27 Mar 2013 10:51:33 +0000 (11:51 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hwaccel: fix use with frame based multithreading
Conflicts:
libavcodec/h263dec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Mar 2013 10:42:15 +0000 (11:42 +0100)]
Merge commit '
c24469e812501903a46a06eff9722a82e136e841 '
* commit '
c24469e812501903a46a06eff9722a82e136e841 ':
utils: add workaround for AVHWAccel in ff_get_buffer compat code
configure: Remove a stray msmpeg4v1 encoder declaration
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 27 Mar 2013 10:32:45 +0000 (11:32 +0100)]
Merge commit '
3b2d0ec473b036bdd0a5bc0d896fd5292915f44d '
* commit '
3b2d0ec473b036bdd0a5bc0d896fd5292915f44d ':
configure: Remove the mpegvideo dependency from svq1
x86: vc1dsp: Fix indentation
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
d s [Wed, 27 Mar 2013 02:36:44 +0000 (19:36 -0700)]
Update MAINTAINERS with information about avisynth demuxer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
d s [Wed, 27 Mar 2013 02:36:18 +0000 (19:36 -0700)]
Fix avisynth_context_create constructor error handling.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 27 Mar 2013 00:48:07 +0000 (01:48 +0100)]
Support pcm_mulaw in Hikvision CCTV mpeg program streams.
Fixes decoding the sample from videolan trac ticket #8344.
Carl Eugen Hoyos [Wed, 27 Mar 2013 00:55:11 +0000 (01:55 +0100)]
Fix a typo in the Monkey's Audio demuxer.
Clément Bœsch [Wed, 27 Mar 2013 00:43:37 +0000 (01:43 +0100)]
doc: "av* tools" -> "ff* tools".
Spotted-by: Timothy Gu <timothygu99@gmail.com>
Michael Niedermayer [Wed, 27 Mar 2013 00:38:18 +0000 (01:38 +0100)]
tests/tiny_ssim: include the 2 macros instead of a header
Should fix compilation on open solaris
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Tue, 26 Mar 2013 21:45:40 +0000 (22:45 +0100)]
vdpau: fix obsolete mpeg1 vdpau decoder when mpeg2 is disabled
Janne Grunau [Tue, 26 Mar 2013 18:59:36 +0000 (19:59 +0100)]
configure: fix dependencies of XvMC and old vdpau mpeg2 decoders
Michael Niedermayer [Tue, 26 Mar 2013 20:54:36 +0000 (21:54 +0100)]
mpegvideo: fix null pointer dereference on switching streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Wed, 13 Mar 2013 22:36:51 +0000 (23:36 +0100)]
hwaccel: fix use with frame based multithreading
Allows use of AVHWAccel based decoders with frame based multithreading.
The decoders will be forced into an non-concurrent mode by delaying
ff_thread_finish_setup() calls after decoding of the current frame
is finished.
This wastes memory by unnecessarily using multiple threads and thus
copies of the decoder context but allows seamless switching between
hardware accelerated and frame threaded software decoding when the
hardware decoder does not support the stream.
Janne Grunau [Mon, 25 Mar 2013 16:28:37 +0000 (17:28 +0100)]
utils: add workaround for AVHWAccel in ff_get_buffer compat code
Since
c977039e585bfff28ecc037ef827c6c3d1ed88aa plane count for
PIX_FMT_HWACCEL pixel formats is 0 instead of 1. The created dummy
AVBuffers are still bogus since AVFrame does not hold frame data when
AVHWAccels are used.
Michael Niedermayer [Tue, 26 Mar 2013 18:27:32 +0000 (19:27 +0100)]
mpegvideo/h264: drop period_since_free
This should not be needed anymore
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Mar 2013 18:26:44 +0000 (19:26 +0100)]
tiny_ssim: Avoid "for(int ..."
This should avoid issues with old compilers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Loren Merritt [Sun, 24 Mar 2013 15:04:48 +0000 (16:04 +0100)]
tools: add tiny_ssim
Taken from:
http://lists.mplayerhq.hu/pipermail/mencoder-users/2006-August/003801.html
and
x264
See: [FFmpeg-devel] [PATCH] tools: add tiny_ssim
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Tue, 26 Mar 2013 13:34:47 +0000 (15:34 +0200)]
configure: Remove a stray msmpeg4v1 encoder declaration
No such encoder exists currently.
Signed-off-by: Martin Storsjö <martin@martin.st>
Carl Eugen Hoyos [Tue, 26 Mar 2013 14:16:07 +0000 (15:16 +0100)]
Only test the first frame for missing aac_adtstoasc bistream filter.
Many players ignore broken aac frames, so don't abort mov or flv
muxing when encountering one, just print a warning instead.
Fixes ticket #2380.
Carl Eugen Hoyos [Tue, 26 Mar 2013 14:15:46 +0000 (15:15 +0100)]
mpegtsenc: Only test the first frame for missing h264_mp4toannexb filter.
Many video players accept broken frames in a transport stream, so there
is no reason to abort remuxing when encountering one, just print a
warning instead.
Fixes ticket #1758.
Martin Storsjö [Tue, 26 Mar 2013 10:37:11 +0000 (12:37 +0200)]
configure: Remove the mpegvideo dependency from svq1
The svq1 decoder can be built standalone without mpegvideo.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 26 Mar 2013 11:54:22 +0000 (13:54 +0200)]
x86: vc1dsp: Fix indentation
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 26 Mar 2013 13:43:12 +0000 (14:43 +0100)]
configure: mpegvideo should not depend on error resilience
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Mar 2013 13:41:55 +0000 (14:41 +0100)]
configure: the snow encoder is not supposed to depend on error resilience
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Mar 2013 13:36:00 +0000 (14:36 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: Make it possible to compile without error_resilience
Conflicts:
configure
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 26 Mar 2013 12:23:46 +0000 (12:23 +0000)]
lavfi/mptestsrc: make use of AV_OPT_TYPE_VIDEO_RATE
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 26 Mar 2013 12:19:16 +0000 (12:19 +0000)]
lavfi/cellauto: make use of AV_OPT_TYPE_VIDEO_RATE
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 26 Mar 2013 12:12:53 +0000 (12:12 +0000)]
lavfi/life: make use of AV_OPT_TYPE_VIDEO_RATE
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 26 Mar 2013 12:08:44 +0000 (12:08 +0000)]
lavfi/mandelbrot: make use of AV_OPT_TYPE_VIDEO_RATE
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 26 Mar 2013 12:02:47 +0000 (12:02 +0000)]
lavfi/testsrc: make use of AV_OPT_TYPE_VIDEO_RATE
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 26 Mar 2013 12:01:18 +0000 (12:01 +0000)]
lavfi/fps: make use of AV_OPT_TYPE_VIDEO_RATE
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 26 Mar 2013 12:32:12 +0000 (13:32 +0100)]
Merge commit '
f1e9398621af0bc9d166014e4ce6996bb4f141d0 '
* commit '
f1e9398621af0bc9d166014e4ce6996bb4f141d0 ':
lavc: Rename avpriv_mpv_find_start_code after moving out from mpegvideo
Conflicts:
libavcodec/h264_parser.c
libavcodec/internal.h
libavcodec/mpeg12.c
libavcodec/utils.c
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Mar 2013 12:23:01 +0000 (13:23 +0100)]
Revert "Fix compilation with --disable-everything --enable-parser=h264."
This reverts commit
e0e8c20559d1197868b2620d8d9c560167a8f5d6 .
The mpegvideo dependancy should not be needed anymore
Michael Niedermayer [Tue, 26 Mar 2013 12:22:48 +0000 (13:22 +0100)]
Merge commit '
75644335b907919057960716508477239c26fed4 '
* commit '
75644335b907919057960716508477239c26fed4 ':
lavc: Move start code finding to utils.c
Conflicts:
configure
libavcodec/mpegvideo.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Mar 2013 12:14:16 +0000 (13:14 +0100)]
Merge commit '
613a37eca4c7b8eefceaa3e0231c23ad090ca94f '
* commit '
613a37eca4c7b8eefceaa3e0231c23ad090ca94f ':
ape: 3.80-3.92 decoding support
h264: Remove an unused variable
Conflicts:
libavcodec/apedec.c
libavformat/ape.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Mar 2013 12:02:37 +0000 (13:02 +0100)]
x86/dsputil.asm: make unaligned bswap actually work
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 26 Mar 2013 11:53:47 +0000 (12:53 +0100)]
Merge commit '
e5c2794a7162e485eefd3133af5b98fd31386aeb '
* commit '
e5c2794a7162e485eefd3133af5b98fd31386aeb ':
x86: consistently use unaligned movs in the unaligned bswap
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sun, 3 Mar 2013 00:57:26 +0000 (16:57 -0800)]
h264: Make it possible to compile without error_resilience
Error resilience is enabled by the h264 decoder, unless explicitly
disabled. --disable-everything --enable-decoder=h264 will produce
a h264 decoder with error resilience enabled, while
--disable-everything --enable-decoder=h264 --disable-error-resilience
will produce a h264 decoder with error resilience disabled.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 25 Mar 2013 12:11:41 +0000 (14:11 +0200)]
lavc: Rename avpriv_mpv_find_start_code after moving out from mpegvideo
Also move the declaration to internal.h, and add restrict qualifiers
to the declaration (as in the implementation).
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 25 Mar 2013 10:42:57 +0000 (12:42 +0200)]
lavc: Move start code finding to utils.c
This allows dropping the mpegvideo dependency from a number of
components.
This also fixes standalone building of the h264 parser, which
was broken in
64e438697 .
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 26 Mar 2013 03:04:19 +0000 (04:04 +0100)]
avcodec/x86/dsputil_qns_template: use av_assert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 26 Mar 2013 01:41:05 +0000 (02:41 +0100)]
lavfi/perms: add myself to the copyright header.
Clément Bœsch [Tue, 26 Mar 2013 01:39:55 +0000 (02:39 +0100)]
lavfi/perms: add seed option.
Clément Bœsch [Tue, 26 Mar 2013 01:24:03 +0000 (02:24 +0100)]
lavfi/perms: remove unecessary indirection after
f7324c06 .
Michael Niedermayer [Tue, 26 Mar 2013 00:50:23 +0000 (01:50 +0100)]
ffmpeg_opt: avoid strcpy()
This fixes a warning on openbsd and is more robust
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 18 Mar 2013 03:02:51 +0000 (04:02 +0100)]
tools: add audio normalize script example.
Clément Bœsch [Tue, 26 Mar 2013 00:05:26 +0000 (01:05 +0100)]
lavfi/curves: add forgotten strong_contrast preset.
Clément Bœsch [Mon, 25 Mar 2013 23:00:15 +0000 (00:00 +0100)]
lavfi/curves: support preset shorthand.
Clément Bœsch [Mon, 25 Mar 2013 00:19:17 +0000 (01:19 +0100)]
lavfi/curves: add presets support.
Except for the vintage preset, the values are defined by Lou Logan based
on the ones found in Adobe Photoshop CS6.
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Lou Logan <lou@lrcd.com>