Michael Niedermayer
d42a61922b
avcodec/psymodel: use av_malloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
5ec8192949
avcodec/fft-test: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
eccec20397
avformat/mp3enc: drop redundant and uninitialized variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
82796aacab
avformat/utils: reinject global side data on seeks
...
This fixes ffplay replaygain with seeking
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c0d62d999d
avformat/utils: factorize if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
289f02f923
avformat/utils: Inject global side data into first packet.
...
This fixes replaygain handling in ffplay and probably other applications.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a31547ce2e
avutil/avstring: do not lose ascii characters when decoding non utf-8 with av_utf8_decode()
...
Fixes Ticket3363
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
ca6dd53a73
ffprobe: do not lose non ascii characters in non utf8 strings
...
Fixes Ticket3363
Using U+FFFD REPLACEMENT CHARACTER as suggested by nicolas
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Peter Ross
e311b7446a
avformat/iff: indent
...
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Peter Ross
d95c9679f7
avformat/iff: remove unused code
...
bits_per_coded_sample and block_align are calculated again at end of if() block
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b6c1e80bf4
Merge commit '0f524b6c690962d7ebbd59ded74288e1e9b0f009'
...
* commit '0f524b6c690962d7ebbd59ded74288e1e9b0f009':
x86/synth_filter: remove the fma3 version ifdefs
See: 7d2116dd09
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
878f8b0d26
Merge commit 'aaab192df24a90f4450285cfb73b395cf495b462'
...
* commit 'aaab192df24a90f4450285cfb73b395cf495b462':
af_volume: implement replaygain clipping prevention
Conflicts:
doc/filters.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c11aa9d29a
Merge commit 'ac976ed91e323754e9a84509873ebdb437372797'
...
* commit 'ac976ed91e323754e9a84509873ebdb437372797':
lavr: allocate the resampling buffer with a positive size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
c955525f72
Merge commit '13164e479f1c87829096c19003d2cc658ccc1fd4'
...
* commit '13164e479f1c87829096c19003d2cc658ccc1fd4':
FATE: add tests for more resampling modes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
cbfa71d689
Merge commit 'f7c5fd81516fb7b186c64c66dc080e1139586226'
...
* commit 'f7c5fd81516fb7b186c64c66dc080e1139586226':
resample: implement flushing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Facundo Gaich
7e6b3ad693
lavfi/subtitles: load attached fonts to libass.
...
Videos with complex typesetting usually have font files embedded
as attachment streams. vf_subtitles now finds all attachment
streams with a MIME type associated with fonts and loads them
to libass so it can use them for rendering.
The code was basically ported from mpv's loadfile.c@929793be7
Signed-off-by: Facundo Gaich <facugaich@gmail.com>
11 years ago
James Almer
0f524b6c69
x86/synth_filter: remove the fma3 version ifdefs
...
This fixes compilation failures with --disable-fma3
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Alessandro Ghedini
aaab192df2
af_volume: implement replaygain clipping prevention
...
This adds a new "replaygain_noclip" option to the filter, and, if enabled,
limits the gain applied for tracks where clipping would occur.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
11 years ago
Anton Khirnov
ac976ed91e
lavr: allocate the resampling buffer with a positive size
...
This fixes cases where very few input samples (fewer than needed for one
output sample) are passed to lavr at the beginning.
CC:libav-stable@libav.org
11 years ago
Anton Khirnov
13164e479f
FATE: add tests for more resampling modes
11 years ago
Anton Khirnov
f7c5fd8151
resample: implement flushing
11 years ago
Lukasz Marek
88c4e5a049
lavd/avdevice: fix buildbreak when included to C++ code
...
class is reserved keyword in C++ and compilator complains about that variable.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
1dc2d4a8ef
avcodec/tiff: remove unused variables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a676e48d39
Merge commit '801c39e1e3058fc4ba822bfb5d8612d777111e32'
...
* commit '801c39e1e3058fc4ba822bfb5d8612d777111e32':
dcadec: Use correct channel count in stereo downmix check
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
952614b899
Merge commit 'c8cf461c19e8e35df4b7364d9b90aa42f1ab4560'
...
* commit 'c8cf461c19e8e35df4b7364d9b90aa42f1ab4560':
dcadec: Do not decode the XCh extension when downmixing to stereo
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d7644e0fdb
Merge commit 'e75ef2b7f48b96a9b6c8646058713899d5ea5731'
...
* commit 'e75ef2b7f48b96a9b6c8646058713899d5ea5731':
tiffdec: support predictor type 2 with RGB48 pixel format
Conflicts:
libavcodec/tiff.c
See: 72381b2b47
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
a64d6d5152
Merge commit '345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe'
...
* commit '345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe':
tiffdec: remove an unneeded variable
Conflicts:
libavcodec/tiff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b9b2f9d218
Merge commit 'a9b046fb0ae5395c4d1d8a82cd0d3e354b5034ed'
...
* commit 'a9b046fb0ae5395c4d1d8a82cd0d3e354b5034ed':
tiff: use a better name and enum values for PhotometricInterpretation
Conflicts:
libavcodec/tiff.c
libavcodec/tiff.h
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
75b4e40137
Merge commit 'fdbe18b7b0545f9b5923d25a5433e4f735719ecc'
...
* commit 'fdbe18b7b0545f9b5923d25a5433e4f735719ecc':
tiffdec: use a single strip if RowsPerStrip is 0
Conflicts:
libavcodec/tiff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
94cf83ff91
Merge commit '0a467a9b594dd67aa96bad687d05f8845b009f18'
...
* commit '0a467a9b594dd67aa96bad687d05f8845b009f18':
tiffdec: use bytestream2 to simplify overread/overwrite protection
Conflicts:
libavcodec/tiff.c
See: 1ec83d9a9e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
31876ea620
Merge commit '5748faf291fec297ef25d81962b52b3438f54278'
...
* commit '5748faf291fec297ef25d81962b52b3438f54278':
bytestream: add bytestream2_copy_buffer() functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d06a7530f7
Merge commit 'de9d2705f61ef569487ec5f8974a9c7ce34ec783'
...
* commit 'de9d2705f61ef569487ec5f8974a9c7ce34ec783':
bytestream: add functions for accessing size of buffer
See: 0ee5be4ee4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
b394b9013e
Merge commit '58bc38a5f224d29b79338200459792c765c25fd5'
...
* commit '58bc38a5f224d29b79338200459792c765c25fd5':
tiffdec: use correct data type for palette entries and set alpha to 0xFF
Conflicts:
libavcodec/tiff.c
See: dbfdb288c1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
6145b1d9c1
Merge commit 'bf2064f046af64c59a416c814474a39b0a457569'
...
* commit 'bf2064f046af64c59a416c814474a39b0a457569':
tiffdec: rename variables for consistency and fix variable shadowing
Conflicts:
libavcodec/tiff.c
See: 251345a3fe
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
69505a89f1
Merge commit 'd9a542ace1b9ca5c0ea6d758127d03d4124b7801'
...
* commit 'd9a542ace1b9ca5c0ea6d758127d03d4124b7801':
swscale: Set alpha to opaque for internal palettes.
Conflicts:
libswscale/swscale_unscaled.c
See: dbfdb288c1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
57570052e2
Merge commit '20c38c9c18b75e62f6c489d9b95bea88efdf3915'
...
* commit '20c38c9c18b75e62f6c489d9b95bea88efdf3915':
swscale: fix some undefined signed left shifts
Conflicts:
libswscale/swscale_unscaled.c
See: 7a32ab5ed0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
28875c4188
Merge commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad'
...
* commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad':
swscale: fix an implementation-defined unsigned-to-signed conversion
Conflicts:
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d3284a6208
Merge remote-tracking branch 'lukaszmluki/master'
...
* lukaszmluki/master:
lavd/qtkit: add device category
lavd/fbdev_enc: implement get_device_list
lavd: no default device unless explicitly set
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
275155081f
Merge commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71'
...
* commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71':
doc: Libavfilter English cleanup
Conflicts:
doc/filters.texi
doc/libavfilter.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Tim Walker
801c39e1e3
dcadec: Use correct channel count in stereo downmix check
...
s->prim_channels is greater than num_core_channels
when an XCh extension is present in the bitstream.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
Tim Walker
c8cf461c19
dcadec: Do not decode the XCh extension when downmixing to stereo
...
This is neither necessary nor currently supported.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
11 years ago
Michael Niedermayer
571d2ffa47
Merge commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03'
...
* commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03':
mp3enc: Properly write bitrate value in XING header
Conflicts:
libavformat/mp3enc.c
See: 40176fc314
See: d62bf5d4e7
See: various others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Jean First
e75ef2b7f4
tiffdec: support predictor type 2 with RGB48 pixel format
11 years ago
Justin Ruggles
345a96c327
tiffdec: remove an unneeded variable
11 years ago
Justin Ruggles
a9b046fb0a
tiff: use a better name and enum values for PhotometricInterpretation
...
Also add additional known values and log as missing features.
11 years ago
Justin Ruggles
fdbe18b7b0
tiffdec: use a single strip if RowsPerStrip is 0
...
The spec does not specify that 0 is an error condition, and there
are samples which use 0 when the whole image is in one strip.
11 years ago
Justin Ruggles
0a467a9b59
tiffdec: use bytestream2 to simplify overread/overwrite protection
...
Based on a patch by Paul B Mahol <onemda@gmail.com>
CC:libav-stable@libav.org
11 years ago
Justin Ruggles
5748faf291
bytestream: add bytestream2_copy_buffer() functions
...
This is basically an overread/overwrite-safe memcpy between a
GetByteContext and a PutByteContext.
CC:libav-stable@libav.org
11 years ago
Paul B Mahol
de9d2705f6
bytestream: add functions for accessing size of buffer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org
11 years ago
Justin Ruggles
58bc38a5f2
tiffdec: use correct data type for palette entries and set alpha to 0xFF
11 years ago