Michael Niedermayer
6190aae90d
Merge commit 'ffb068ce8e99df121d18a5b9b1d820f3ea8697fb'
...
* commit 'ffb068ce8e99df121d18a5b9b1d820f3ea8697fb':
configure: Don't do enable_deep_weak on disabled variables
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
085a4e6b16
Merge commit '4d810ad2e943a59658ddf00a397121c2b62f7157'
...
* commit '4d810ad2e943a59658ddf00a397121c2b62f7157':
configure: Use a different variable name in push/popvar
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
482c1ac849
Merge commit '13f57a4d881ec669b87bf82f424bfff502433060'
...
* commit '13f57a4d881ec669b87bf82f424bfff502433060':
wav: K&R formatting cosmetics
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
1ba4cbf734
Merge commit '6b753015ca6f93d16a05e1a97da1fa42e4da60ec'
...
* commit '6b753015ca6f93d16a05e1a97da1fa42e4da60ec':
aac: Remove aacpsy.h header, unused since 78e65cd772
cavs: Remove cavsdata.h header, unused since 88386feefd
Conflicts:
libavcodec/aacpsy.h
libavcodec/cavsdata.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
05599308e9
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>
12 years ago
Michael Niedermayer
35ef98013d
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>
12 years ago
Michael Niedermayer
ed1697ffcb
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>
12 years ago
Luca Barbato
af4cc2605c
id3v2: check for end of file while unescaping tags
...
Prevent a serious out of buffer bound write.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
12 years ago
Anton Khirnov
76d23f4031
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.
12 years ago
Anton Khirnov
b4a5a29227
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.
12 years ago
Anton Khirnov
e3b225a4fe
matroskaenc: add an option to put the index at the start of the file
12 years ago
Anton Khirnov
0574bc06d2
matroskaenc: cosmetics, reorder the #includes
12 years ago
Masaki Tanaka
accde1bd87
vc1_parser: Set field_order.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years ago
Masaki Tanaka
f43c14d046
mpegvideo_parser: Set field_order.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years ago
Masaki Tanaka
507b1e454c
avcodec: Add field order information to AVCodecParserContext.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years ago
Christophe Gisquet
566b7a20fd
x86: float dsp: butterflies_float SSE
...
97c -> 49c
Some codecs could benefit from more unrolling, but AAC doesn't.
12 years ago
Anton Khirnov
b333f3a22a
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.
12 years ago
Anton Khirnov
803d21f38b
lavc: schedule AVCodecContext.lowres for removal on next bump.
...
It has been deprecated some time ago, but was forgotten during the last
bump.
12 years ago
highgod0401
f685aee18f
lavu/opencl: fix the compile bug on linux
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
2e2b6d7ab3
fate: Adjust filter-trim-time parameters
...
This should workaround rounding differences between platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
ae2132ac90
mmvideo/mm_decode_intra: check horizontal coordinate too
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
8d3c99e825
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>
12 years ago
Martin Storsjö
ffb068ce8e
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>
12 years ago
Martin Storsjö
4d810ad2e9
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>
12 years ago
Luca Barbato
13f57a4d88
wav: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
12 years ago
Michael Niedermayer
fd68371b07
nutdec: Implement duration parsing for indexed nuts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Diego Biurrun
6b753015ca
aac: Remove aacpsy.h header, unused since 78e65cd772
12 years ago
Diego Biurrun
153f31b1af
cavs: Remove cavsdata.h header, unused since 88386feefd
12 years ago
Michael Niedermayer
60ab448042
ape_decode_value_3860: check k before using it in get_bits()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
8937230719
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>
12 years ago
Michael Niedermayer
49ec4c7e49
ffmpeg: fix segfault with random output
...
Found-by: <durandal_1707>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
highgod0401
6354a6ce52
lavu/opencl: fix bug of opencl options
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Paul B Mahol
a64c9afe3d
lavfi/blend: merge config_input_top into config_output
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
990b13806d
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>
12 years ago
Michael Niedermayer
89b5039ff2
avutil/mem: add av_memdup()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Paul B Mahol
663794f63d
vmdav: unbreak decoding of samples from game The Last Dynasty
...
This fixes video output with samples HG060808.VMD and
HG060810.VMD. Regression since c0cbe36b18
.
While here show warning if decoding is aborted for some reason.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
cdada4f639
vmdav: return meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Michael Niedermayer
4d4ec18b21
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Add wmv2 dependency to vc1 compilation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
0beff42823
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>
12 years ago
Diego Biurrun
bf7c3c6b15
x86: dsputil: Move cavs and vc1-specific functions where they belong
12 years ago
Diego Biurrun
9328062321
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.
12 years ago
Diego Biurrun
9c112a6158
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.
12 years ago
Diego Biurrun
9b3a04d306
x86: Move duplicated put_pixels{8|16}_mmx functions into their own file
12 years ago
Carl Eugen Hoyos
d0a661d48a
Add wmv2 dependency to vc1 compilation.
...
Fixes compilation with --disable-everything --enable-decoder=vc1.
12 years ago
Luca Barbato
0671adbb18
id3v2: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
12 years ago
Diego Biurrun
a650c906cb
ppc: Only compile AltiVec FFT assembly when AltiVec is enabled
12 years ago
Michael Niedermayer
6021615bbe
avcodec/ansi: Fix right/bottom end checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
e91fd754c6
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>
12 years ago
Michael Niedermayer
c1f2c4c3b4
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>
12 years ago
Michael Niedermayer
d602f16a37
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>
12 years ago