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
2014-04-13 11:21:20 +02:00
13164e479f
FATE: add tests for more resampling modes
2014-04-13 11:20:49 +02:00
f7c5fd8151
resample: implement flushing
2014-04-13 11:15:45 +02:00
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>
2014-04-13 04:59:35 +02:00
1dc2d4a8ef
avcodec/tiff: remove unused variables
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-13 04:33:20 +02:00
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>
2014-04-13 04:23:56 +02:00
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>
2014-04-13 04:07:27 +02:00
d7644e0fdb
Merge commit 'e75ef2b7f48b96a9b6c8646058713899d5ea5731'
...
* commit 'e75ef2b7f48b96a9b6c8646058713899d5ea5731':
tiffdec: support predictor type 2 with RGB48 pixel format
Conflicts:
libavcodec/tiff.c
See: 72381b2b47
2014-04-13 04:02:09 +02:00
a64d6d5152
Merge commit '345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe'
...
* commit '345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe':
tiffdec: remove an unneeded variable
Conflicts:
libavcodec/tiff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-13 03:54:11 +02:00
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>
2014-04-13 03:45:45 +02:00
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>
2014-04-13 03:30:02 +02:00
94cf83ff91
Merge commit '0a467a9b594dd67aa96bad687d05f8845b009f18'
...
* commit '0a467a9b594dd67aa96bad687d05f8845b009f18':
tiffdec: use bytestream2 to simplify overread/overwrite protection
Conflicts:
libavcodec/tiff.c
See: 1ec83d9a9e
2014-04-13 03:20:09 +02:00
31876ea620
Merge commit '5748faf291fec297ef25d81962b52b3438f54278'
...
* commit '5748faf291fec297ef25d81962b52b3438f54278':
bytestream: add bytestream2_copy_buffer() functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-13 02:06:47 +02:00
d06a7530f7
Merge commit 'de9d2705f61ef569487ec5f8974a9c7ce34ec783'
...
* commit 'de9d2705f61ef569487ec5f8974a9c7ce34ec783':
bytestream: add functions for accessing size of buffer
See: 0ee5be4ee4
2014-04-13 02:05:15 +02:00
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
2014-04-13 02:01:31 +02:00
6145b1d9c1
Merge commit 'bf2064f046af64c59a416c814474a39b0a457569'
...
* commit 'bf2064f046af64c59a416c814474a39b0a457569':
tiffdec: rename variables for consistency and fix variable shadowing
Conflicts:
libavcodec/tiff.c
See: 251345a3fe
2014-04-13 01:49:19 +02:00
69505a89f1
Merge commit 'd9a542ace1b9ca5c0ea6d758127d03d4124b7801'
...
* commit 'd9a542ace1b9ca5c0ea6d758127d03d4124b7801':
swscale: Set alpha to opaque for internal palettes.
Conflicts:
libswscale/swscale_unscaled.c
See: dbfdb288c1
2014-04-13 01:44:27 +02:00
57570052e2
Merge commit '20c38c9c18b75e62f6c489d9b95bea88efdf3915'
...
* commit '20c38c9c18b75e62f6c489d9b95bea88efdf3915':
swscale: fix some undefined signed left shifts
Conflicts:
libswscale/swscale_unscaled.c
See: 7a32ab5ed0
2014-04-13 01:39:31 +02:00
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>
2014-04-13 01:26:49 +02:00
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>
2014-04-13 00:50:37 +02:00
275155081f
Merge commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71'
...
* commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71':
doc: Libavfilter English cleanup
Conflicts:
doc/filters.texi
doc/libavfilter.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-13 00:37:32 +02:00
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>
2014-04-12 23:05:37 +02:00
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>
2014-04-12 23:05:07 +02:00
571d2ffa47
Merge commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03'
...
* commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03':
mp3enc: Properly write bitrate value in XING header
Conflicts:
libavformat/mp3enc.c
See: 40176fc314d62bf5d4e7
2014-04-12 21:26:20 +02:00
e75ef2b7f4
tiffdec: support predictor type 2 with RGB48 pixel format
2014-04-12 14:52:10 -04:00
345a96c327
tiffdec: remove an unneeded variable
2014-04-12 14:52:10 -04:00
a9b046fb0a
tiff: use a better name and enum values for PhotometricInterpretation
...
Also add additional known values and log as missing features.
2014-04-12 14:52:07 -04:00
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.
2014-04-12 14:49:08 -04:00
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
2014-04-12 14:49:08 -04:00
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
2014-04-12 14:49:08 -04:00
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
2014-04-12 14:49:08 -04:00
58bc38a5f2
tiffdec: use correct data type for palette entries and set alpha to 0xFF
2014-04-12 14:49:07 -04:00
bf2064f046
tiffdec: rename variables for consistency and fix variable shadowing
...
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2014-04-12 14:49:07 -04:00
4f698be8f6
avutil/log: add av_log_get_flags()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-12 20:25:10 +02:00
d9a542ace1
swscale: Set alpha to opaque for internal palettes.
...
Fixes conversion of pal8 to rgb formats with alpha.
Updated references for 2 FATE tests which previously encoded fully
transparent images.
Based on a patch by Baptiste Coudurier <baptiste.coudurier@gmail.com>
2014-04-12 14:07:19 -04:00
defb87eef4
lavd/qtkit: add device category
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-04-12 19:50:09 +02:00
afc898e7ce
lavd/fbdev_enc: implement get_device_list
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-04-12 19:47:58 +02:00
20c38c9c18
swscale: fix some undefined signed left shifts
...
Based on a patch by Michael Niedermayer <michaelni@gmx.at>
2014-04-12 13:24:47 -04:00
60c4660ba0
swscale: fix an implementation-defined unsigned-to-signed conversion
2014-04-12 13:24:47 -04:00
c1c3c3611e
lavd: no default device unless explicitly set
...
AVDeviceInfoList was allocated with first device set as default
even though there is no device after allocation.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-04-12 19:14:57 +02:00
e89f3d0ed2
avcodec/ffv1: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-12 15:41:00 +02:00
713e62e91d
avcodec/faxcompr: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-12 15:37:57 +02:00
36053aeff6
vcodec/error_resilience: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-12 15:33:55 +02:00
d4a8a86c68
doc: Libavfilter English cleanup
...
This aims to standardize the English used in the libavfilter
documentation, describing the same thing in the same way more often,
and significantly reduce the amount of outright errors, including
run-on sentences and sentence fragments.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-04-12 14:34:11 +02:00
617a1a98a6
mp3enc: Properly write bitrate value in XING header
...
Instead of using a fixed bitrate_idx, calculate a matching bitrate for
the XING header.
Using a fixed bitrate_idx causes tools such as file(1) and mediainfo(1)
to report wrong bitrate and bitrate mode when using CBR.
Bug-Id: https://bugs.debian.org/736088
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-04-12 13:29:55 +02:00
fb4ac46d7f
avcodec/elbg: Use av_malloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-12 05:40:37 +02:00
46375e9a97
avcodec/diracdec: use av_malloc(z)_array
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-12 05:38:31 +02:00
f683895dee
avformat/img2dec: support nanosecond file times
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-12 04:52:01 +02:00
513a431e07
avformat/hls: reduce memory usage by using dynamically allocated url/key
...
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
2014-04-12 03:14:52 +03:00
66e959682c
avcodec/mpegvideo_enc: override bitrate tolerance when its value is too small
...
Fixes Ticket3257
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-12 01:29:20 +02:00
Anton Khirnov
Lukasz Marek
Michael Niedermayer
Tim Walker
Jean First
Justin Ruggles
Paul B Mahol
Katerina Barone-Adesi
Michael Schenk