Michael Niedermayer [Tue, 15 Apr 2014 13:09:57 +0000 (15:09 +0200)]
avcodec/mpegaudioenc_template: Fix integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Apr 2014 11:47:27 +0000 (13:47 +0200)]
avutil/frame: use av_malloc(z)_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Apr 2014 11:45:26 +0000 (13:45 +0200)]
avformat/xmv: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Apr 2014 11:42:46 +0000 (13:42 +0200)]
avformat/mpegtsenc: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Apr 2014 11:35:46 +0000 (13:35 +0200)]
avformat/utils: fix typo
Found-by: reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Apr 2014 04:35:35 +0000 (06:35 +0200)]
swresample/resample_template: try to consider src_size more exactly
This should avoid slight differences in the output causes by input
size alignment differences between archs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Apr 2014 02:08:32 +0000 (04:08 +0200)]
configure: fix arm osx build
Fixes Ticket3561
Solution suggested by jeremyhu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 17:20:17 +0000 (19:20 +0200)]
avformat: add av_format_inject_global_side_data(), and disable it by default
After this commit applications needs to call av_format_inject_global_side_data()
or handle AVStream side data by some other means if they want it not to be lost.
This fixes a API incompatibility with libav.
libav API does not allow the data to be passed through AVPackets
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 23:22:52 +0000 (01:22 +0200)]
Merge commit '
a6ac4fcce44108f6f87278b8d12e890576f46a62'
* commit '
a6ac4fcce44108f6f87278b8d12e890576f46a62':
vp78: Align the intra4x4_pred_mode_top array within VP8Macroblock
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 21:46:15 +0000 (23:46 +0200)]
swscale/utils: fix changing src/dst range after initializing the context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 21:32:41 +0000 (23:32 +0200)]
swscale/utils: move handling of unscaled case to the end of init function
This way all context fields get initialized and can be used without needing to reinit the context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 21:18:21 +0000 (23:18 +0200)]
swscale: factor ff_sws_init_range_convert() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 21:15:31 +0000 (23:15 +0200)]
swscale/swscale: clear to/from convert pointers when they used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 19:40:59 +0000 (21:40 +0200)]
avformat/img2dec: fix typo
Found-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 14 Apr 2014 17:43:04 +0000 (20:43 +0300)]
vp78: Align the intra4x4_pred_mode_top array within VP8Macroblock
This array is written using AV_WN32A, assuming alignment.
This hopefully fixes the failing vp7 fate test on sparc.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 14 Apr 2014 16:34:53 +0000 (18:34 +0200)]
Merge branch 'flac' of https://github.com/FernetMenta/FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 15:29:27 +0000 (17:29 +0200)]
avcodec/x86/idct_sse2_xvid: fix non C99 inline function
Found-by: Matt Oliver <protogonoi@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rainer Hochecker [Mon, 14 Apr 2014 14:06:55 +0000 (16:06 +0200)]
fate: update seeking reference for flac
Rainer Hochecker [Sat, 12 Apr 2014 16:13:32 +0000 (18:13 +0200)]
flac demuxer: improve seeking
Carl Eugen Hoyos [Mon, 14 Apr 2014 13:36:01 +0000 (15:36 +0200)]
Set the bitrate when decoding speex.
The bitrate of the first frame is used as bitrate for the speex stream.
Carl Eugen Hoyos [Mon, 14 Apr 2014 13:34:38 +0000 (15:34 +0200)]
Fix writing RGB 5:5:5 rawvideo into avi.
WMP expects bits per pixel to be set to 16 for RGB 5:5:5 rawvideo.
Michael Niedermayer [Mon, 14 Apr 2014 12:44:12 +0000 (14:44 +0200)]
Merge commit '
b3d905b702dcdda9e3ae2bcb7b5580ca77a96ab7'
* commit '
b3d905b702dcdda9e3ae2bcb7b5580ca77a96ab7':
dcadec: Delete redundant init_get_bits call
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 12:31:50 +0000 (14:31 +0200)]
Merge commit '
4d40e073dcdef335215c124d340ea156bc4bdf13'
* commit '
4d40e073dcdef335215c124d340ea156bc4bdf13':
rtmpproto: Handle RTMP chunk size packets before the connect packet
Conflicts:
libavformat/rtmpproto.c
See:
36b9c27dae452e10b4fff3d10f836160a5b8fbbd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stephan Soller [Sat, 12 Apr 2014 23:06:22 +0000 (01:06 +0200)]
avformat/rtmpproto: Added handling of an initial RTMP chunk size packet.
Fixes ticket #2911.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 12:12:41 +0000 (14:12 +0200)]
Merge commit '
6477139721f559b26eafd415e23e13ea2b0c27e1'
* commit '
6477139721f559b26eafd415e23e13ea2b0c27e1':
rtmpproto: Make sure to pass on the error code if read_connect failed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Niels Möller [Mon, 14 Apr 2014 08:26:57 +0000 (10:26 +0200)]
dcadec: Delete redundant init_get_bits call
No initialization is needed in dca_decode_frame, because the next
thing it does is calling dca_parse_frame_header, which takes care of
the needed initialization.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Stephan Soller [Sat, 12 Apr 2014 23:06:22 +0000 (01:06 +0200)]
rtmpproto: Handle RTMP chunk size packets before the connect packet
In all other cases where ff_rtmp_packet_read is used, the packet returned
is passed to rtmp_parse_result more or less immediately. In this single
case, the content of the packet was required to be a connect packet.
Some clients, e.g. Open Broadcaster Software, send a chunk size packet
before the connect packet. If the first packet is a chunk size packet,
handle it and read another one, requiring this to be a connect packet
instead.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 13 Apr 2014 10:44:03 +0000 (13:44 +0300)]
rtmpproto: Make sure to pass on the error code if read_connect failed
Previously, if read_connect failed, the ret variable was unmodified
and had the value 0, indicating success, which then was returned from
the rtmp_open function, even though it actually failed.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 14 Apr 2014 00:23:04 +0000 (02:23 +0200)]
swresample/resample: simplify index/consumed calculation for the filter = 1 case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 00:20:33 +0000 (02:20 +0200)]
swresample/resample: Fix fractional part of index in the filter_size = 1 filters = 1 case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 22:53:05 +0000 (00:53 +0200)]
fate/libswresample: add tests with filter_size=1 phase_shift=0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 21:54:49 +0000 (23:54 +0200)]
avcodec/utils: prettify remap_deprecated_codec_id()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 21:39:49 +0000 (23:39 +0200)]
avformat/network: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 21:31:12 +0000 (23:31 +0200)]
avcodec/psymodel: use av_malloc(z)_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 21:28:57 +0000 (23:28 +0200)]
avcodec/fft-test: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 18:03:24 +0000 (20:03 +0200)]
avformat/mp3enc: drop redundant and uninitialized variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 16:27:05 +0000 (18:27 +0200)]
avformat/utils: reinject global side data on seeks
This fixes ffplay replaygain with seeking
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 16:02:42 +0000 (18:02 +0200)]
avformat/utils: factorize if()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 15:57:43 +0000 (17:57 +0200)]
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>
Michael Niedermayer [Sat, 12 Apr 2014 18:01:33 +0000 (20:01 +0200)]
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>
Michael Niedermayer [Sat, 12 Apr 2014 18:13:13 +0000 (20:13 +0200)]
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>
Peter Ross [Sun, 13 Apr 2014 04:45:10 +0000 (14:45 +1000)]
avformat/iff: indent
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sun, 13 Apr 2014 04:44:58 +0000 (14:44 +1000)]
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>
Michael Niedermayer [Sun, 13 Apr 2014 12:46:38 +0000 (14:46 +0200)]
Merge commit '
0f524b6c690962d7ebbd59ded74288e1e9b0f009'
* commit '
0f524b6c690962d7ebbd59ded74288e1e9b0f009':
x86/synth_filter: remove the fma3 version ifdefs
See:
7d2116dd09d19d9aa08f9155a932d684c8d6a2f7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 12:39:51 +0000 (14:39 +0200)]
Merge commit '
aaab192df24a90f4450285cfb73b395cf495b462'
* commit '
aaab192df24a90f4450285cfb73b395cf495b462':
af_volume: implement replaygain clipping prevention
Conflicts:
doc/filters.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 12:28:51 +0000 (14:28 +0200)]
Merge commit '
ac976ed91e323754e9a84509873ebdb437372797'
* commit '
ac976ed91e323754e9a84509873ebdb437372797':
lavr: allocate the resampling buffer with a positive size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 12:12:46 +0000 (14:12 +0200)]
Merge commit '
13164e479f1c87829096c19003d2cc658ccc1fd4'
* commit '
13164e479f1c87829096c19003d2cc658ccc1fd4':
FATE: add tests for more resampling modes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 12:00:20 +0000 (14:00 +0200)]
Merge commit '
f7c5fd81516fb7b186c64c66dc080e1139586226'
* commit '
f7c5fd81516fb7b186c64c66dc080e1139586226':
resample: implement flushing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Facundo Gaich [Wed, 9 Apr 2014 03:18:35 +0000 (00:18 -0300)]
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>
James Almer [Sat, 5 Apr 2014 17:00:53 +0000 (14:00 -0300)]
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>
Alessandro Ghedini [Sun, 6 Apr 2014 14:25:08 +0000 (16:25 +0200)]
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>
Anton Khirnov [Thu, 20 Mar 2014 19:40:24 +0000 (20:40 +0100)]
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
Anton Khirnov [Tue, 4 Mar 2014 11:03:19 +0000 (12:03 +0100)]
FATE: add tests for more resampling modes
Anton Khirnov [Tue, 4 Mar 2014 21:38:47 +0000 (22:38 +0100)]
resample: implement flushing
Lukasz Marek [Sat, 12 Apr 2014 19:14:21 +0000 (21:14 +0200)]
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>
Michael Niedermayer [Sun, 13 Apr 2014 02:33:20 +0000 (04:33 +0200)]
avcodec/tiff: remove unused variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 02:23:56 +0000 (04:23 +0200)]
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>
Michael Niedermayer [Sun, 13 Apr 2014 02:07:27 +0000 (04:07 +0200)]
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>
Michael Niedermayer [Sun, 13 Apr 2014 02:00:28 +0000 (04:00 +0200)]
Merge commit '
e75ef2b7f48b96a9b6c8646058713899d5ea5731'
* commit '
e75ef2b7f48b96a9b6c8646058713899d5ea5731':
tiffdec: support predictor type 2 with RGB48 pixel format
Conflicts:
libavcodec/tiff.c
See:
72381b2b479d99962092ce458ac8e98f00528f86
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 01:54:11 +0000 (03:54 +0200)]
Merge commit '
345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe'
* commit '
345a96c327e8f2a8077189af9f5e8d2b3f4ad5fe':
tiffdec: remove an unneeded variable
Conflicts:
libavcodec/tiff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 01:45:45 +0000 (03:45 +0200)]
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>
Michael Niedermayer [Sun, 13 Apr 2014 01:29:23 +0000 (03:29 +0200)]
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>
Michael Niedermayer [Sun, 13 Apr 2014 01:01:03 +0000 (03:01 +0200)]
Merge commit '
0a467a9b594dd67aa96bad687d05f8845b009f18'
* commit '
0a467a9b594dd67aa96bad687d05f8845b009f18':
tiffdec: use bytestream2 to simplify overread/overwrite protection
Conflicts:
libavcodec/tiff.c
See:
1ec83d9a9e472f485897ac92bad9631d551a8c5b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 00:05:50 +0000 (02:05 +0200)]
Merge commit '
5748faf291fec297ef25d81962b52b3438f54278'
* commit '
5748faf291fec297ef25d81962b52b3438f54278':
bytestream: add bytestream2_copy_buffer() functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 00:04:33 +0000 (02:04 +0200)]
Merge commit '
de9d2705f61ef569487ec5f8974a9c7ce34ec783'
* commit '
de9d2705f61ef569487ec5f8974a9c7ce34ec783':
bytestream: add functions for accessing size of buffer
See:
0ee5be4ee480c59d5f0e384566992795a5bb7ff8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 00:01:10 +0000 (02:01 +0200)]
Merge commit '
58bc38a5f224d29b79338200459792c765c25fd5'
* commit '
58bc38a5f224d29b79338200459792c765c25fd5':
tiffdec: use correct data type for palette entries and set alpha to 0xFF
Conflicts:
libavcodec/tiff.c
See:
dbfdb288c1921eeb9fef5bca20eee33da7fcdd71
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Apr 2014 23:48:43 +0000 (01:48 +0200)]
Merge commit '
bf2064f046af64c59a416c814474a39b0a457569'
* commit '
bf2064f046af64c59a416c814474a39b0a457569':
tiffdec: rename variables for consistency and fix variable shadowing
Conflicts:
libavcodec/tiff.c
See:
251345a3fe221d60e9b275567085f9475de68092
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Apr 2014 23:44:27 +0000 (01:44 +0200)]
Merge commit '
d9a542ace1b9ca5c0ea6d758127d03d4124b7801'
* commit '
d9a542ace1b9ca5c0ea6d758127d03d4124b7801':
swscale: Set alpha to opaque for internal palettes.
Conflicts:
libswscale/swscale_unscaled.c
See:
dbfdb288c1921eeb9fef5bca20eee33da7fcdd71
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Apr 2014 23:39:31 +0000 (01:39 +0200)]
Merge commit '
20c38c9c18b75e62f6c489d9b95bea88efdf3915'
* commit '
20c38c9c18b75e62f6c489d9b95bea88efdf3915':
swscale: fix some undefined signed left shifts
Conflicts:
libswscale/swscale_unscaled.c
See:
7a32ab5ed0b0523d1868da8232ff15831712a18f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Apr 2014 23:26:49 +0000 (01:26 +0200)]
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>
Michael Niedermayer [Sat, 12 Apr 2014 22:50:34 +0000 (00:50 +0200)]
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>
Michael Niedermayer [Sat, 12 Apr 2014 22:37:32 +0000 (00:37 +0200)]
Merge commit '
d4a8a86c6863ecea208fa2f774690b6df4b5bc71'
* commit '
d4a8a86c6863ecea208fa2f774690b6df4b5bc71':
doc: Libavfilter English cleanup
Conflicts:
doc/filters.texi
doc/libavfilter.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Tim Walker [Sat, 12 Apr 2014 20:11:53 +0000 (22:11 +0200)]
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>
Tim Walker [Sat, 12 Apr 2014 20:11:52 +0000 (22:11 +0200)]
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>
Michael Niedermayer [Sat, 12 Apr 2014 19:12:42 +0000 (21:12 +0200)]
Merge commit '
617a1a98a6be3e59db6fbfc21afab2fb9a049c03'
* commit '
617a1a98a6be3e59db6fbfc21afab2fb9a049c03':
mp3enc: Properly write bitrate value in XING header
Conflicts:
libavformat/mp3enc.c
See:
40176fc3149bc72c1309f93989a57aec2322e626
See:
d62bf5d4e73250295c0a652e151498c5b19cbd63
See: various others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Jean First [Sun, 25 Sep 2011 14:00:04 +0000 (16:00 +0200)]
tiffdec: support predictor type 2 with RGB48 pixel format
Justin Ruggles [Mon, 30 Sep 2013 05:00:20 +0000 (01:00 -0400)]
tiffdec: remove an unneeded variable
Justin Ruggles [Mon, 30 Sep 2013 04:39:51 +0000 (00:39 -0400)]
tiff: use a better name and enum values for PhotometricInterpretation
Also add additional known values and log as missing features.
Justin Ruggles [Mon, 30 Sep 2013 04:11:12 +0000 (00:11 -0400)]
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.
Justin Ruggles [Sun, 29 Sep 2013 23:47:55 +0000 (19:47 -0400)]
tiffdec: use bytestream2 to simplify overread/overwrite protection
Based on a patch by Paul B Mahol <onemda@gmail.com>
CC:libav-stable@libav.org
Justin Ruggles [Sun, 29 Sep 2013 23:45:57 +0000 (19:45 -0400)]
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
Paul B Mahol [Wed, 21 Mar 2012 00:10:18 +0000 (00:10 +0000)]
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
Justin Ruggles [Sat, 28 Sep 2013 16:20:19 +0000 (12:20 -0400)]
tiffdec: use correct data type for palette entries and set alpha to 0xFF
Jean First [Fri, 23 Sep 2011 06:22:31 +0000 (08:22 +0200)]
tiffdec: rename variables for consistency and fix variable shadowing
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Michael Niedermayer [Thu, 20 Mar 2014 02:53:22 +0000 (03:53 +0100)]
avutil/log: add av_log_get_flags()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Sat, 5 Apr 2014 18:14:30 +0000 (14:14 -0400)]
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>
Lukasz Marek [Fri, 11 Apr 2014 14:29:37 +0000 (16:29 +0200)]
lavd/qtkit: add device category
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Sat, 12 Apr 2014 17:25:33 +0000 (19:25 +0200)]
lavd/fbdev_enc: implement get_device_list
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Justin Ruggles [Sat, 5 Apr 2014 18:46:22 +0000 (14:46 -0400)]
swscale: fix some undefined signed left shifts
Based on a patch by Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Sat, 5 Apr 2014 18:05:19 +0000 (14:05 -0400)]
swscale: fix an implementation-defined unsigned-to-signed conversion
Lukasz Marek [Sat, 12 Apr 2014 17:05:54 +0000 (19:05 +0200)]
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>
Michael Niedermayer [Sat, 12 Apr 2014 13:41:00 +0000 (15:41 +0200)]
avcodec/ffv1: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Apr 2014 13:37:57 +0000 (15:37 +0200)]
avcodec/faxcompr: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Apr 2014 13:33:55 +0000 (15:33 +0200)]
vcodec/error_resilience: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Katerina Barone-Adesi [Sun, 6 Apr 2014 10:32:49 +0000 (12:32 +0200)]
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>
Michael Niedermayer [Wed, 9 Apr 2014 16:22:53 +0000 (18:22 +0200)]
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>
Michael Niedermayer [Sat, 12 Apr 2014 03:40:37 +0000 (05:40 +0200)]
avcodec/elbg: Use av_malloc(z)_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Apr 2014 03:38:31 +0000 (05:38 +0200)]
avcodec/diracdec: use av_malloc(z)_array
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 25 May 2013 13:34:27 +0000 (15:34 +0200)]
avformat/img2dec: support nanosecond file times
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Schenk [Fri, 11 Apr 2014 06:14:40 +0000 (08:14 +0200)]
avformat/hls: reduce memory usage by using dynamically allocated url/key
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>