Michael Niedermayer
5e253fdfc1
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rtmp: alias rtmp_listen to listen
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c28bca2bde
Merge commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1'
...
* commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1':
mxf: Remove a typo
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
8aa6ffd8fa
Merge commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad'
...
* commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad':
asfdec: Check the return value of asf_read_stream_properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Clément Bœsch
3841e4510b
avfilter/avf_showspectrum: use the name 's' for the pointer to the private context
11 years ago
Paul B Mahol
848a1e6738
avfilter/af_afade: use the name 's' for the pointer to the private context
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Michael Niedermayer
0425fd7eb2
ffmpeg: dont return reserved values
...
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Clément Bœsch
e31a239fea
avfilter/vf_removelogo: use the name 's' for the pointer to the private context
11 years ago
Paul B Mahol
7d0ce1e59d
avfilter/af_silencedetect: use the name 's' for the pointer to the private context
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Maxim Poliakovski
d49f3fa579
atrac3: Generalize gain compensation code
...
Move it to the ATRAC common code, so it can be reused
in the umpcoming ATRAC3+ decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Maxim Poliakovski
4fa2484067
atrac3/decode_gain_control: cosmetics
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Maxim Poliakovski
4978be2bc6
atrac3: rename num_gain_data to num_points
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Maxim Poliakovski
dc80e250fc
atrac3: Rename GainInfo to AtracGainInfo
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Maxim Poliakovski
746cb9bc53
atrac: limit line length to 80 chars
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Maxim Poliakovski
3d80ab015f
atrac: Move doxygen comments to the header
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Maxim Poliakovski
cc2330fe3a
atrac: Update copyright info and file description.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Maxim Poliakovski
852241561d
atrac: Add missing av_cold.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
286beebdc3
avcodec/wmalosslessdec: check block_align
...
Code copied from wmaprodec
Fixes null pointer dereference
Fixes Ticket3002
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ad8fbddb94
Revert "Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7'" (configure: Properly set zlib dependencies for all components)
...
The reverted commit introduced undefined behavior.
undefined in the sense that the evaluation order of the dependencies affects the results
Fixes Ticket2920
This reverts commit c32db6adab
, reversing
changes made to 05f1b4e2ec
.
Alternative solutions would be to change the dependency solver to handle non trivial
dependencies or to enable zlib by default before the dependency solver, this would
leave a zlib dependency in the libs though then even when no zlib is needed or used.
11 years ago
Paul B Mahol
edadda968c
avfilter/vf_histogram: change order of histograms for planar rgb
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Marton Balint
cac9af68a4
avfilter/vf_histogram: add support for subsampled planar yuv modes in waveform mode
...
Signed-off-by: Marton Balint <cus@passwd.hu>
11 years ago
Marton Balint
31a8461d64
avfilter/vf_histogram: improve waveform speed
...
Signed-off-by: Marton Balint <cus@passwd.hu>
11 years ago
Michael Niedermayer
795eaf8d69
avcodec/fraps: increase vlc nb_bits
...
This should fix decoding the file in:
http://ffmpeg.gusari.org/viewtopic.php?f=16&t=1078
No i dont have the file so i cant test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Thilo Borgmann
d3a03d90a3
configure: fix logic for threads in case of OpenCL is enabled. Fixes ticket 3004.
...
Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Luca Barbato
628a17d78a
rtmp: alias rtmp_listen to listen
...
Make it uniform with the other protocols.
11 years ago
Luca Barbato
ad0560fe74
mxf: Remove a typo
...
Introduced in 93370d1216
11 years ago
Michael Niedermayer
2e2a2d8801
swscale/utils: dont divide by zero with zero vectors
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
wm4
01e3340fb6
swscale: make bilinear scaling the default
...
Before this commit, sws_init_context() failed with an error if no scaler
was explicitly set.
Defaulting to something reasonable is better behavior.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Paul B Mahol
fc0d8cf185
fate: add fieldorder test
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Stefano Sabatini
8fafaf1834
doc: move sws_dither option description to scaler.texi
...
That's the more proper place where the scaler options should be
documented.
11 years ago
Stefano Sabatini
d17aaad630
doc/filters/scale: mention and link scaler options
11 years ago
Stefano Sabatini
fd0a1647f2
doc/filters/scale: fix MAN rendering of @ref arguments
11 years ago
Michael Niedermayer
31b6300f4d
doc: try to add a link from the vf_scale sws_flags to the scaler docs
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Paul B Mahol
0a4aea6db9
avfilter/vf_hflip: support slice threading
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
2a6a3d4317
avfilter/vf_hflip: refactor plane dimensions calculation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Paul B Mahol
862773907a
avfilter/vf_rotate: support slice threading
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Michael Niedermayer
54197c7aae
skip_bits: dont call UPDATE_CACHE
...
UPDATE_CACHE isnt needed and can cause segfaults
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Paul B Mahol
f4ab723a79
cmdutils: print command support in -filters.
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Michael Niedermayer
0a0b7267b2
configure: fix build with enable-xmm-clobber-test
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Timothy Gu
8fd8ead23c
doc/t2h.init: remove resource-type and distribution meta elements
...
The W3C validator complains about these.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
11 years ago
Michael Niedermayer
b0b5012e77
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Avoid img_segment_size == 0 in mtv demuxer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Paul B Mahol
cd1b22d8e8
avfilter/dualinput: simplify
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
11 years ago
Martin Storsjö
cc41167aed
asfdec: Check the return value of asf_read_stream_properties
...
This makes sure errors in setting stream parameters are passed
on to the caller. This avoids successfully opening files while
some parameters aren't filled in properly.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
Carl Eugen Hoyos
e34ba4723e
Avoid img_segment_size == 0 in mtv demuxer.
...
Fixes ticket #3011 .
11 years ago
Michael Niedermayer
5c7d86cbde
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
omadec: fix bitrate for ATRAC3+ streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
7a28a9f68e
Merge commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3'
...
* commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3':
Add support for multichannel ATRAC3+ streams.
Conflicts:
libavformat/oma.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c7fae9081d
Merge commit '93370d12164236d59645314871a1d6808b2a8ddb'
...
* commit '93370d12164236d59645314871a1d6808b2a8ddb':
mxfdec: set audio timebase to 1/samplerate
Conflicts:
libavformat/mxfdec.c
tests/ref/fate/mxf-demux
tests/ref/seek/lavf-mxf
tests/ref/seek/lavf-mxf_d10
See: 83cab07a4c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
bbe50a8001
Merge commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f'
...
* commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f':
pcx: Return an error on broken palette if err_detect is set to 'explode'
Conflicts:
libavcodec/pcx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c955bac7d5
Merge commit 'd1d99e3befea5d411ac3aae72dbdecce94f8b547'
...
* commit 'd1d99e3befea5d411ac3aae72dbdecce94f8b547':
pcx: Check the packet size before assuming it fits a palette
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
1eead87766
Merge commit '7ba0cedbfeff5671b264d1d7e90777057b5714c6'
...
* commit '7ba0cedbfeff5671b264d1d7e90777057b5714c6':
rpza: Fix a buffer size check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
1ad36551ec
Merge commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc'
...
* commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc':
xxan: Disallow odd width
See: 77693c541a
See: 8ad9b48c9b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago