Michael Niedermayer
066d776501
Merge commit '6d6bd3a3db24747ae5e10716f4782129c38951f6'
...
* commit '6d6bd3a3db24747ae5e10716f4782129c38951f6':
mpegts: Drop some unnecessary parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 21:42:34 +02:00
Clément Bœsch
cec59eb63f
avfilter/dctdnoiz: add 8x8 dct and make it the default
...
8x8 is about 5x faster than 16x16 on 1080p input. Since a block size of
8x8 makes the filter almost usable (time wise) and it's not obvious if
8x8 or 16x16 is better from a quality PoV (it really depends on the
input and parameters), the filter now defaults to 8x8, and as a result
libavfilter is micro bumped.
2014-08-07 21:24:12 +02:00
Michael Niedermayer
ec0b08d20b
Merge commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50'
...
* commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50':
mpegts: K&R formatting cosmetics
Conflicts:
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 21:16:06 +02:00
Michael Niedermayer
c6a596f626
doc/APIchanges: Correct function reference.
...
The commit bb789016d4
un-deprecated sws_getContext()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 21:00:46 +02:00
Michael Niedermayer
4917fecf4a
Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e'
...
* commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e':
swscale: Undeprecate sws_getContext()
Conflicts:
libswscale/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 20:52:40 +02:00
Michael Niedermayer
a561662fb7
Merge commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d'
...
* commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d':
avcodec: Undeprecate reordered_opaque
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 20:43:11 +02:00
Michael Niedermayer
2bf87dcc2d
Merge commit 'a7e541c9926d531a100ba0d36f4e56956dd84651'
...
* commit 'a7e541c9926d531a100ba0d36f4e56956dd84651':
h264: fix interpretation of interleved stereo modes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 20:22:16 +02:00
Marek Fort
4e70104aba
avformat/movenc: XMP metadata support.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 20:11:09 +02:00
Marek Fort
054c506e3d
avformat/mov: XMP metadata suppor.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 20:11:09 +02:00
Clément Bœsch
06362ab750
avfilter/dctdnoiz: rewrite [f/i]dct
...
This removes the avcodec dependency and make the code almost twice as
fast. More to come.
The DCT factorization is based on "Fast and numerically stable
algorithms for discrete cosine transforms" from Gerlind Plonkaa &
Manfred Tasche (DOI: 10.1016/j.laa.2004.07.015).
2014-08-07 19:59:07 +02:00
Diego Biurrun
5b220e1e19
mpegts: Fix memory leaks and related crashes in mpegs_write_header()
2014-08-07 07:52:17 -07:00
Diego Biurrun
f8ab9f2fe3
mpegts: Avoid unnecessary variable shadowing
2014-08-07 07:52:17 -07:00
Diego Biurrun
6d6bd3a3db
mpegts: Drop some unnecessary parentheses
2014-08-07 07:52:17 -07:00
Diego Biurrun
b7b1bf9166
mpegts: K&R formatting cosmetics
2014-08-07 07:48:54 -07:00
Michael Niedermayer
75bd83d448
avdevice/lavfi: Simplify non-AV stream check
...
Fixes a clang warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 15:41:17 +02:00
Michael Niedermayer
8fa695a9e3
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Do not automatically map subtitles if the decoder and encoder properties are different.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 14:51:59 +02:00
James Almer
350f4be12d
lavf: remove nonexistent functions from the version file
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 13:35:35 +02:00
James Almer
dd2b0c1cde
lavc: remove nonexistent functions from the version file
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 13:20:59 +02:00
Carl Eugen Hoyos
7d585bc94c
Do not automatically map subtitles if the decoder and encoder properties are different.
...
Fixes ticket #3819 .
2014-08-07 13:18:00 +02:00
James Almer
1fd880cef3
lavd/dshow: use av_codec_get_id()
...
ff_codec_get_id() is a lavf internal function
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 13:03:17 +02:00
Diego Biurrun
bb789016d4
swscale: Undeprecate sws_getContext()
...
sws_getCachedContext is not a full replacement for the function.
2014-08-07 04:03:00 -07:00
Diego Biurrun
ad1ee5fa75
avcodec: Undeprecate reordered_opaque
...
It allows attaching other external, opaque data to the frame and passing it
through the reordering process, for cases when the caller wants other data
than just the plain packet pts. There is no way to cleanly achieve this
without the field.
2014-08-07 04:03:00 -07:00
James Almer
0ab00a75e4
avcodec/raw: add avpriv_get_raw_pix_fmt_tags()
...
Used to expose ff_raw_pix_fmt_tags[] to other libav* libraries
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 12:52:38 +02:00
Felix Abecassis
a7e541c992
h264: fix interpretation of interleved stereo modes
...
Column and row frame packing arrangements were inverted.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-08-07 11:31:47 +01:00
Michael Niedermayer
4c404611da
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Do not return a probe score from set_codec_from_probe_data() if the codec was ignored.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 12:17:35 +02:00
Carl Eugen Hoyos
7c73d21523
lavf/mpegts: Do not return the result of a (void) function from a void function.
...
Fixes compilation with Sun C 5.10.
2014-08-07 09:55:40 +02:00
Carl Eugen Hoyos
ef17a0c7ba
Do not return a probe score from set_codec_from_probe_data() if the codec was ignored.
...
This is a workaround for the issue that stream probing can use
the score of another codec type for mpeg stream autodetection.
Fixes ticket #3821 .
2014-08-07 09:12:34 +02:00
James Almer
5b12b4fc4b
lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()
...
The were wrongly being exported and used by libavdevice
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 04:28:11 +02:00
Michael Niedermayer
1c59419419
Merge commit 'b50173a4dd47b9c3c89845b781fa958ccf860929'
...
* commit 'b50173a4dd47b9c3c89845b781fa958ccf860929':
movenc: fix QT chapter track character encoding
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 02:54:23 +02:00
Michael Niedermayer
403367d5a9
Merge commit 'da9cc22d5bd5f59756c2037b02966376da2cf323'
...
* commit 'da9cc22d5bd5f59756c2037b02966376da2cf323':
movenc: add track title to tracks
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 02:42:15 +02:00
Michael Niedermayer
71f33051e5
Merge commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed'
...
* commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed':
movenc: remove pointless loop around BITEXACT test
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 02:35:39 +02:00
Michael Niedermayer
4213fc5b9e
avcodec/svq1dec: Fix multiple bugs from "svq1: do not modify the input packet"
...
Add padding, clear size, use the correct pointer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 02:27:07 +02:00
Michael Niedermayer
e55e09949e
Merge commit '7b588bb691644e1b3c168b99accf74248a24e3cf'
...
* commit '7b588bb691644e1b3c168b99accf74248a24e3cf':
svq1: do not modify the input packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 02:08:56 +02:00
Michael Niedermayer
c628627995
Merge commit 'c7d9b473e28238d4a4ef1b7e8b42c1cca256da36'
...
* commit 'c7d9b473e28238d4a4ef1b7e8b42c1cca256da36':
cdgraphics: do not return 0 from the decode function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 01:56:50 +02:00
Michael Niedermayer
91b4ed0918
Merge commit 'a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812'
...
* commit 'a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812':
cdgraphics: switch to bytestream2
Conflicts:
libavcodec/cdgraphics.c
See: ad002e1a13
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 01:45:22 +02:00
James Almer
8dfb8190d7
libavcodec/rawdec: remove old ff_find_pix_fmt() function
...
It's been dead code for more than a year
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 00:44:07 +02:00
Michael Niedermayer
6a44699746
avformat/dtsdec: check more of the dca headers in dts_probe()
...
Fixes misdetection of 664461_flac_16_44100_2.wav
Fixes Ticket3830
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 22:28:46 +02:00
Michael Niedermayer
7a34b7d80f
avcodec/dca: Make ff_dca_convert_bitstream() available to libavformat, needed for dts_probe()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 22:28:35 +02:00
John Stebbins
b50173a4dd
movenc: fix QT chapter track character encoding
...
An encoding ("encd") box is required to tell QT that the string is UTF8
2014-08-06 13:27:17 -07:00
John Stebbins
da9cc22d5b
movenc: add track title to tracks
2014-08-06 13:27:17 -07:00
John Stebbins
d9432789bd
movenc: remove pointless loop around BITEXACT test
2014-08-06 13:27:17 -07:00
Anton Khirnov
7b588bb691
svq1: do not modify the input packet
...
The input data must remain constant, make a copy instead. This is in
theory a performance hit, but since I failed to find any samples
using this feature, this should not matter in practice.
Also, check the size of the header, avoiding invalid reads on truncated
data.
CC:libav-stable@libav.org
2014-08-06 18:59:27 +00:00
Michael Niedermayer
40a820d6d8
Merge commit 'ed6d9ce914d552eeda16af857da97c4b1aea1e3f'
...
* commit 'ed6d9ce914d552eeda16af857da97c4b1aea1e3f':
configure: Include the armcc build number in the compiler identification
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 20:56:05 +02:00
Anton Khirnov
c7d9b473e2
cdgraphics: do not return 0 from the decode function
...
0 means no data consumed, so it can trigger an infinite loop in the
caller.
CC:libav-stable@libav.org
2014-08-06 18:32:42 +00:00
Anton Khirnov
a1599f3f7e
cdgraphics: switch to bytestream2
...
Fixes possible invalid memory accesses on corrupted data.
CC:libav-stable@libav.org
Bug-ID: CVE-2013-3674
2014-08-06 18:32:38 +00:00
Michael Niedermayer
5836fe20c6
Merge commit 'cbc808d726afdf53d866264722785c1304c17390'
...
* commit 'cbc808d726afdf53d866264722785c1304c17390':
jpeg2000: enable 4 component pixel formats
See: f0358dc1d3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 20:29:09 +02:00
Christophe Gisquet
75837e9add
x86: sbrdsp/fft: reuse ps_neg constant
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 19:25:08 +02:00
Christophe Gisquet
51dd80e751
x86: diracdsp: reuse constants
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 19:25:02 +02:00
Christophe Gisquet
6622a6cff3
x86: dwt: better share constants
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 19:24:57 +02:00
Christophe Gisquet
71db2d08b1
x86: better share ff_pw_2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 19:24:49 +02:00