]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Thu, 10 Oct 2013 09:30:28 +0000 (11:30 +0200)]
Merge commit '
ceec6e792e4b5baaa23b220f4fd33417631f5288 '
* commit '
ceec6e792e4b5baaa23b220f4fd33417631f5288 ':
avi: directly resync on DV in AVI read failure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Oct 2013 08:54:17 +0000 (10:54 +0200)]
Merge commit '
756547ce7f4d67a18663503e2157aebed3531703 '
* commit '
756547ce7f4d67a18663503e2157aebed3531703 ':
avi: DV in AVI must be considered single stream
Conflicts:
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Oct 2013 08:38:46 +0000 (10:38 +0200)]
Merge commit '
1cac9accbd1f9b8596122d0735e37b97a844c514 '
* commit '
1cac9accbd1f9b8596122d0735e37b97a844c514 ':
avi: properly fail if the dv demuxer is missing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Oct 2013 07:55:17 +0000 (09:55 +0200)]
Michael Niedermayer [Thu, 10 Oct 2013 07:45:11 +0000 (09:45 +0200)]
Merge commit '
071e29af4d383bdb44d0c87416dee3e4bb597936 '
* commit '
071e29af4d383bdb44d0c87416dee3e4bb597936 ':
vmnc: Use meaningful return values
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Oct 2013 07:37:55 +0000 (09:37 +0200)]
Merge commit '
5e992a4682d2c09eed3839c6cacf70db3b65c2f4 '
* commit '
5e992a4682d2c09eed3839c6cacf70db3b65c2f4 ':
vmnc: Check the cursor dimensions
Conflicts:
libavcodec/vmnc.c
See:
94372592767fb551060217df37f5aa3130ba1ca8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Oct 2013 07:18:16 +0000 (09:18 +0200)]
Merge commit '
61cd19b8bc32185c8caf64d89d1b0909877a0707 '
* commit '
61cd19b8bc32185c8caf64d89d1b0909877a0707 ':
vmnc: Port to bytestream2
Conflicts:
libavcodec/vmnc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 10 Oct 2013 07:04:22 +0000 (09:04 +0200)]
Merge commit '
a66aa0daf290ef157cb3322b034b43d6201c43e9 '
* commit '
a66aa0daf290ef157cb3322b034b43d6201c43e9 ':
vmnc: K&R formatting cosmetics
Conflicts:
libavcodec/vmnc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Tue, 6 Aug 2013 01:52:48 +0000 (03:52 +0200)]
avi: directly resync on DV in AVI read failure
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Tue, 6 Aug 2013 01:38:12 +0000 (03:38 +0200)]
avi: DV in AVI must be considered single stream
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Mon, 5 Aug 2013 23:39:07 +0000 (01:39 +0200)]
avi: properly fail if the dv demuxer is missing
CC: libav-stable@libav.org
Michael Niedermayer [Thu, 10 Oct 2013 00:25:51 +0000 (02:25 +0200)]
avcodec/h264: call flush_change() on init
This ensures that all the non zero fields get setup correctly.
Alternatively their initialization could be duplicated.
Fixes Ticket2738
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 9 Oct 2013 21:52:54 +0000 (23:52 +0200)]
avcodec/h264_refs: modify key frame detection heuristic to detect more cases
Fixes Ticket2968
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Wed, 9 Oct 2013 04:17:12 +0000 (06:17 +0200)]
jpeg2000: Check block length
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Wed, 9 Oct 2013 03:58:59 +0000 (05:58 +0200)]
vmnc: Use meaningful return values
Luca Barbato [Wed, 9 Oct 2013 03:51:20 +0000 (05:51 +0200)]
vmnc: Check the cursor dimensions
And manage the reallocation failure path.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Wed, 9 Oct 2013 03:13:59 +0000 (05:13 +0200)]
vmnc: Port to bytestream2
Fix some buffer overreads.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Luca Barbato [Wed, 9 Oct 2013 10:58:42 +0000 (12:58 +0200)]
vmnc: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Wed, 9 Oct 2013 19:43:06 +0000 (21:43 +0200)]
avformat/wavdec: Dont trust the fact chunk for PCM
Fixes Ticket3033
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 9 Oct 2013 13:32:21 +0000 (15:32 +0200)]
lavd/xv.c: Include XShm.h before Xvlib.h.
This may fix compilation with libxv 1.0.4.
Michael Niedermayer [Wed, 9 Oct 2013 14:28:51 +0000 (16:28 +0200)]
avfilter/buffersink: try to fix AV_NOPTS_VALUE
no testcase available, just found this issue by reading the code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 9 Oct 2013 14:24:00 +0000 (16:24 +0200)]
avfilter/ff_filter_frame_needs_framing: fix handling of AV_NOPTS_VALUE
Fixes Ticket3015
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 9 Oct 2013 13:46:44 +0000 (13:46 +0000)]
avcodec/exr: use avpriv_report_missing_feature()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Wed, 9 Oct 2013 12:21:14 +0000 (12:21 +0000)]
avcodec/vmnc: use av_freep()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 9 Oct 2013 12:27:00 +0000 (14:27 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86inc: Remove .rodata kludges
Conflicts:
libavutil/x86/x86inc.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 9 Oct 2013 12:00:33 +0000 (14:00 +0200)]
Merge commit '
9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1 '
* commit '
9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1 ':
build: Require yasm 0.8.0 or higher
Conflicts:
configure
If someone wants to continue supporting older yasm/nasm versions, patches are of course welcome!
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Henrik Gramner [Wed, 11 Sep 2013 15:49:25 +0000 (17:49 +0200)]
x86inc: Remove .rodata kludges
The Mach-O bug was fixed in yasm 0.8.0 and we don't
support versions that old anymore.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Mon, 7 Oct 2013 11:18:54 +0000 (07:18 -0400)]
build: Require yasm 0.8.0 or higher
This is in preparation for removing a .rodata kludge
which was only required for older YASM versions.
The movbe instruction was introduced in 0.8.0, which already
had AVX, which was introduced in 0.7.0, and NASM introduced
movbe in 2.0.3, which is the same version which introduced
AVX support.
Also, make the failure message more accurate.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Clément Bœsch [Wed, 9 Oct 2013 11:22:04 +0000 (13:22 +0200)]
doc/filters: remove extra spacing in vid.stab section.
Michael Niedermayer [Wed, 9 Oct 2013 09:04:06 +0000 (11:04 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
shorten: Extend fixed_coeffs to properly support pred_order 0
Conflicts:
libavcodec/shorten.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 9 Oct 2013 07:42:16 +0000 (09:42 +0200)]
Fix make checkheaders for vp9 header files.
Carl Eugen Hoyos [Wed, 9 Oct 2013 07:39:57 +0000 (09:39 +0200)]
Add pulse_audio_common.h to skipheaders.
Fixes an error when running make checkheaders.
Lou Logan [Sun, 6 Oct 2013 00:09:15 +0000 (16:09 -0800)]
MAINTAINERS: add Communication section
Add Twitter with myself (Lou Logan) as maintainer.
Add Google+ with Paul B Mahol, Michael Niedermayer, and Alexander
Strasser as maintainers.
Move website and mailinglists from Miscellaneous Areas to
Communication.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Timothy Gu [Tue, 24 Sep 2013 03:40:45 +0000 (20:40 -0700)]
doc/default.css + doc/t2h.init: New styles
The main motive of this commit is to make the offline copy of the HTML doc as
pretty as the online (ffmpeg.org) one. This also introduced new styles for
<h2> to <h4>.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Wed, 4 Sep 2013 17:26:36 +0000 (19:26 +0200)]
shorten: Extend fixed_coeffs to properly support pred_order 0
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Michael Niedermayer [Tue, 8 Oct 2013 22:30:46 +0000 (00:30 +0200)]
ffserver: strip odd chars from html error messages before sending them back
Fixes Ticket3034
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Fri, 4 Oct 2013 12:21:29 +0000 (14:21 +0200)]
lavd/pulse: move common code to separate file
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Fri, 4 Oct 2013 12:29:06 +0000 (14:29 +0200)]
lavd/pulse: rename pulse.c into pulse_audio_dec.c
This make name of the file more specific
as there is also encoder implementation.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 7 Oct 2013 15:08:27 +0000 (15:08 +0000)]
avfilter/af_join: remove now unnecessary goto
Options are freed from the generic code now, there is no need to call
av_opt_free() from the filter.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 7 Oct 2013 13:41:50 +0000 (13:41 +0000)]
avcodec/xwddec: use avpriv_report_missing_feature
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 8 Oct 2013 11:29:29 +0000 (11:29 +0000)]
dpx: abgr support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Lukasz Marek [Fri, 4 Oct 2013 09:49:07 +0000 (11:49 +0200)]
lavd: pulse audio encoder
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Oct 2013 15:35:13 +0000 (17:35 +0200)]
avformat/movenc: factor out find_fps()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Oct 2013 11:38:59 +0000 (13:38 +0200)]
Changelog: add max_error_rate
Suggested-by: Paul B Mahol
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Tue, 8 Oct 2013 00:06:47 +0000 (20:06 -0400)]
x86: Fix compilation with nasm on PPC & OS/2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Oct 2013 10:09:52 +0000 (12:09 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: h264_idct: Update comments to match 8/10-bit depth optimization split
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Oct 2013 10:02:18 +0000 (12:02 +0200)]
Merge commit '
3e2fa991db7ef172579422accd61624d52777e5a '
* commit '
3e2fa991db7ef172579422accd61624d52777e5a ':
x86inc: remove misaligned cpu flag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Oct 2013 09:57:33 +0000 (11:57 +0200)]
Merge commit '
71155665414b551ad350622d5abed20e58371fbf '
* commit '
71155665414b551ad350622d5abed20e58371fbf ':
x86inc: various minor backports from x264
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Oct 2013 09:37:18 +0000 (11:37 +0200)]
Merge commit '
47f9d7ce5493e119e09d1227d017414feaaf8d97 '
* commit '
47f9d7ce5493e119e09d1227d017414feaaf8d97 ':
x86inc: Check for __OUTPUT_FORMAT__ having a value of "x64"
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Oct 2013 09:22:54 +0000 (11:22 +0200)]
Merge commit '
bbe4a6db44f0b55b424a5cc9d3e89cd88e250450 '
* commit '
bbe4a6db44f0b55b424a5cc9d3e89cd88e250450 ':
x86inc: Utilize the shadow space on 64-bit Windows
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Oct 2013 09:15:11 +0000 (11:15 +0200)]
Merge commit '
3fb78e99a04d0ed8db834d813d933eb86c37142a '
* commit '
3fb78e99a04d0ed8db834d813d933eb86c37142a ':
x86inc: create xm# and ym#, analagous to m#
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Oct 2013 09:06:58 +0000 (11:06 +0200)]
Merge commit '
49ebe3f9fe02174ae7e14548001fd146ed375cc2 '
* commit '
49ebe3f9fe02174ae7e14548001fd146ed375cc2 ':
x86inc: fix some corner cases of SWAP
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Oct 2013 09:01:35 +0000 (11:01 +0200)]
Merge commit '
63f0d623100bdb0c6081456127f4b6713e83d3db '
* commit '
63f0d623100bdb0c6081456127f4b6713e83d3db ':
x86inc: Use SSE instead of SSE2 for copying data
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Oct 2013 08:52:47 +0000 (10:52 +0200)]
Merge commit '
ad76e6e7e193b98e7335156422d35467816f9ef1 '
* commit '
ad76e6e7e193b98e7335156422d35467816f9ef1 ':
x86inc: Set ELF hidden visibility for global constants
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Oct 2013 08:45:13 +0000 (10:45 +0200)]
Merge commit '
e52567c2954f627d420b30f75f71af2f2e4afe80 '
* commit '
e52567c2954f627d420b30f75f71af2f2e4afe80 ':
build: Strip spurious labels
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 8 Oct 2013 08:27:20 +0000 (10:27 +0200)]
Merge commit '
25cb0c1a1e66edacc1667acf6818f524c0997f10 '
* commit '
25cb0c1a1e66edacc1667acf6818f524c0997f10 ':
x86inc: activate REP_RET automatically
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Tue, 8 Oct 2013 00:06:47 +0000 (20:06 -0400)]
avcodec/x86/vp9dsp: Fix compilation with nasm.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 1 Oct 2013 16:17:16 +0000 (18:17 +0200)]
ffmpeg: add max_error_rate to allow tuning the point decoding errors are considered a failure of the whole transcoding.
Suggested-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Oct 2013 20:04:36 +0000 (22:04 +0200)]
avfilter/vf_deshake: fix block_contrast() lower brightness value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sun, 6 Oct 2013 16:15:14 +0000 (18:15 +0200)]
x86: h264_idct: Update comments to match 8/10-bit depth optimization split
Lenny Wang [Mon, 7 Oct 2013 17:44:34 +0000 (12:44 -0500)]
avfilter/deshake
The old row index looks weird and wrong to me
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Oct 2013 15:34:01 +0000 (17:34 +0200)]
avcodec/options_table: add field_order
This allows setting and overriding the field order
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 7 Oct 2013 10:10:39 +0000 (10:10 +0000)]
avcodec/dpx: support for 8 and 16 bit luma only files
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 7 Oct 2013 11:20:13 +0000 (11:20 +0000)]
avcodec/dpx: refactor pixel format selection
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 7 Oct 2013 09:54:03 +0000 (11:54 +0200)]
avfilter/lswsutils: dont override the default scaler
This should make no difference as this code is only used by removelogo which
seems to refuse to use masks of different size.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Henrik Gramner [Wed, 11 Sep 2013 15:49:29 +0000 (17:49 +0200)]
x86inc: remove misaligned cpu flag
Prevents a crash if the misaligned exception mask bit is
cleared for some reason.
Misaligned SSE functions are only used on AMD Phenom CPUs
and the benefit is miniscule. They also require modifying
the MXCSR control register and by removing those functions
we can get rid of that complexity altogether.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Jason Garrett-Glaser [Wed, 11 Sep 2013 15:49:28 +0000 (17:49 +0200)]
x86inc: various minor backports from x264
Small backports that sneaked into other asm commits in x264.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Wed, 11 Sep 2013 15:49:27 +0000 (17:49 +0200)]
x86inc: Check for __OUTPUT_FORMAT__ having a value of "x64"
This is also a valid value for WIN64.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Henrik Gramner [Wed, 11 Sep 2013 15:49:26 +0000 (17:49 +0200)]
x86inc: Utilize the shadow space on 64-bit Windows
Store XMM6 and XMM7 in the shadow space in functions that
clobbers them. This way we don't have to adjust the stack
pointer as often, reducing the number of instructions as
well as code size.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Loren Merritt [Wed, 11 Sep 2013 15:49:24 +0000 (17:49 +0200)]
x86inc: create xm# and ym#, analagous to m#
For when we want to mix simd sizes within one function.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Loren Merritt [Wed, 11 Sep 2013 15:49:23 +0000 (17:49 +0200)]
x86inc: fix some corner cases of SWAP
SWAP with >=3 named (rather than numbered) args
PERMUTE followed by SWAP with 2 named args
used to produce the wrong permutation
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Henrik Gramner [Wed, 11 Sep 2013 15:49:22 +0000 (17:49 +0200)]
x86inc: Use SSE instead of SSE2 for copying data
Reduces code size because movaps/movups is one byte
shorter than movdqa/movdqu.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Henrik Gramner [Wed, 11 Sep 2013 15:49:21 +0000 (17:49 +0200)]
x86inc: Set ELF hidden visibility for global constants
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Loren Merritt [Thu, 12 Sep 2013 18:06:23 +0000 (18:06 +0000)]
build: Strip spurious labels
The implementation of
25cb0c1a involves lots of spurious labels.
The effect of keeping those labels around is making debugging harder.
Those labels are meaningless, and complicate the disassembly. Also,
gdb can't tell the difference between them and function entry points.
This new strip command is irrelevant to any usage of Libav that would
have used the old fully stripped version, because the old one was for
non-debug use.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Loren Merritt [Wed, 11 Sep 2013 15:49:20 +0000 (17:49 +0200)]
x86inc: activate REP_RET automatically
Now RET checks whether it immediately follows a branch, so the
programmer dosen't have to keep track of that condition. REP_RET
is still needed manually when it's a branch target, but that's
much rarer.
The implementation involves lots of spurious labels, but that's OK
because we strip them.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Lukasz Marek [Fri, 4 Oct 2013 12:01:51 +0000 (14:01 +0200)]
doc/indevs: make pulse dev formatting consistent with other devices
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Niv Sardi [Fri, 4 Oct 2013 14:36:53 +0000 (11:36 -0300)]
lavu/parseutils: add more resolutions
See http://en.wikipedia.org/wiki/Graphics_display_resolution
Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Michael Niedermayer [Mon, 7 Oct 2013 09:37:37 +0000 (11:37 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: fdct: Employ more specific ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 7 Oct 2013 09:26:47 +0000 (11:26 +0200)]
Paul B Mahol [Mon, 7 Oct 2013 09:10:00 +0000 (09:10 +0000)]
avcodec/dpx: return different error code for unsupported depths
Also give better message in such cases.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 7 Oct 2013 08:40:17 +0000 (08:40 +0000)]
avfilter/vf_drawtext: remove dead initialization
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 7 Oct 2013 08:28:00 +0000 (08:28 +0000)]
avfilter/vf_phase: remove dead initialization
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 6 Oct 2013 20:34:50 +0000 (22:34 +0200)]
ffmpeg: dont detect slight (0.1sec) backward moving dts as discontinuity
Michael Niedermayer [Sun, 6 Oct 2013 23:12:23 +0000 (01:12 +0200)]
avformat/oggparseflac: fix handling of old flac in ogg
Improves handling of the file in Ticket1617
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Oct 2013 23:11:22 +0000 (01:11 +0200)]
avcodec/flac_parser: export sample_rate also when PARSER_FLAG_COMPLETE_FRAMES is set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 6 Oct 2013 20:17:10 +0000 (20:17 +0000)]
avcodec/dpx: make .long_name more descriptive
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 6 Oct 2013 12:51:08 +0000 (12:51 +0000)]
avcodec: add dpx parser
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diego Biurrun [Mon, 16 Sep 2013 11:58:26 +0000 (13:58 +0200)]
x86: fdct: Employ more specific ifdefs
This avoids building mmxext and sse2 code when disabled by configure.
Diego Biurrun [Sun, 6 Oct 2013 10:52:12 +0000 (12:52 +0200)]
bmv: Remove unused variable
Michael Niedermayer [Tue, 1 Oct 2013 23:27:22 +0000 (01:27 +0200)]
configure: filters should select the parts they need not use deps
otherwise enabling the filter would not work if the part hasnt been
enabled by other means already
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Oct 2013 13:22:18 +0000 (15:22 +0200)]
fate: fix dpx on big endian
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Oct 2013 10:33:32 +0000 (12:33 +0200)]
avfilter/vf_scale: dont duplicate default.
use the defaults set by swscale
Suggested-by: stefano
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Oct 2013 10:24:13 +0000 (12:24 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
oggparsevorbis: return meaningful errors
Conflicts:
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Oct 2013 09:49:22 +0000 (11:49 +0200)]
Merge commit '
2ddb35b91131115c094d90e04031451023441b4d '
* commit '
2ddb35b91131115c094d90e04031451023441b4d ':
x86: dsputil: Separate ff_add_hfyu_median_prediction_cmov from dsputil_mmx
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Oct 2013 09:38:02 +0000 (11:38 +0200)]
Merge commit '
6b3ff6f91a535d6383f41ca7bdf760165dcb6015 '
* commit '
6b3ff6f91a535d6383f41ca7bdf760165dcb6015 ':
swscale: provide a default scaler if none is set
Conflicts:
libswscale/utils.c
The default is left at bicubic until someone has compared the scalers
properly speed and quality wise.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Oct 2013 09:30:54 +0000 (11:30 +0200)]
Merge commit '
258414d0771845d20f646ffe4d4e60f22fba217c '
* commit '
258414d0771845d20f646ffe4d4e60f22fba217c ':
x86: fdct: Initialize optimized fdct implementations in the standard way
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Oct 2013 09:24:54 +0000 (11:24 +0200)]
Merge commit '
0b8b2ae5e93d616c2ece59f7175f483154cff918 '
* commit '
0b8b2ae5e93d616c2ece59f7175f483154cff918 ':
x86: xviddct: Employ more specific ifdefs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 6 Oct 2013 09:15:40 +0000 (11:15 +0200)]
Merge commit '
4272bb6ef1533846a788c259cc498562d0704444 '
* commit '
4272bb6ef1533846a788c259cc498562d0704444 ':
doxy: Document avlog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 30 Sep 2013 21:44:06 +0000 (23:44 +0200)]
avfilter/vf_scale: change the default scaler to bicubic
See: [FFmpeg-devel] [PATCH] swscale/options: switch default to bicubic
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 30 Sep 2013 20:18:50 +0000 (22:18 +0200)]
swscale/options: switch default to bicubic
Suggested-by: Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>