summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e'Michael Niedermayer2014-08-07
|\ | | | | | | | | | | | | | | | | | | * commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e': swscale: Undeprecate sws_getContext() Conflicts: libswscale/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: Undeprecate sws_getContext()Diego Biurrun2014-08-07
| | | | | | | | sws_getCachedContext is not a full replacement for the function.
* | Merge commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d'Michael Niedermayer2014-08-07
|\| | | | | | | | | | | | | | | | | | | | | * commit 'ad1ee5fa75a3d69d54c0691048939e94ab5a7f0d': avcodec: Undeprecate reordered_opaque Conflicts: doc/APIchanges libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Undeprecate reordered_opaqueDiego Biurrun2014-08-07
| | | | | | | | | | | | | | 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.
* | Merge commit 'a7e541c9926d531a100ba0d36f4e56956dd84651'Michael Niedermayer2014-08-07
|\| | | | | | | | | | | | | * commit 'a7e541c9926d531a100ba0d36f4e56956dd84651': h264: fix interpretation of interleved stereo modes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: fix interpretation of interleved stereo modesFelix Abecassis2014-08-07
| | | | | | | | | | | | Column and row frame packing arrangements were inverted. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat/movenc: XMP metadata support.Marek Fort2014-08-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: XMP metadata suppor.Marek Fort2014-08-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/dctdnoiz: rewrite [f/i]dctClément Bœsch2014-08-07
| | | | | | | | | | | | | | | | | | 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).
* | avdevice/lavfi: Simplify non-AV stream checkMichael Niedermayer2014-08-07
| | | | | | | | | | Fixes a clang warning Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-08-07
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Do not automatically map subtitles if the decoder and encoder properties are different. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Do not automatically map subtitles if the decoder and encoder properties are ↵Carl Eugen Hoyos2014-08-07
| | | | | | | | | | | | | | | | | | different. Fixes ticket #3819.
* | | lavf: remove nonexistent functions from the version fileJames Almer2014-08-07
| | | | | | | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | lavc: remove nonexistent functions from the version fileJames Almer2014-08-07
| | | | | | | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | lavd/dshow: use av_codec_get_id()James Almer2014-08-07
|/ / | | | | | | | | | | | | 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>
* | avcodec/raw: add avpriv_get_raw_pix_fmt_tags()James Almer2014-08-07
| | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-08-07
|\ \ | | | | | | | | | | | | | | | | | | * 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>
| * | Do not return a probe score from set_codec_from_probe_data() if the codec ↵Carl Eugen Hoyos2014-08-07
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | lavf/mpegts: Do not return the result of a (void) function from a void function.Carl Eugen Hoyos2014-08-07
|/ / | | | | | | Fixes compilation with Sun C 5.10.
* | lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()James Almer2014-08-07
| | | | | | | | | | | | | | 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>
* | Merge commit 'b50173a4dd47b9c3c89845b781fa958ccf860929'Michael Niedermayer2014-08-07
|\| | | | | | | | | | | | | * commit 'b50173a4dd47b9c3c89845b781fa958ccf860929': movenc: fix QT chapter track character encoding Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: fix QT chapter track character encodingJohn Stebbins2014-08-06
| | | | | | | | An encoding ("encd") box is required to tell QT that the string is UTF8
* | Merge commit 'da9cc22d5bd5f59756c2037b02966376da2cf323'Michael Niedermayer2014-08-07
|\| | | | | | | | | | | | | | | | | | | * commit 'da9cc22d5bd5f59756c2037b02966376da2cf323': movenc: add track title to tracks Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: add track title to tracksJohn Stebbins2014-08-06
| |
* | Merge commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed'Michael Niedermayer2014-08-07
|\| | | | | | | | | | | | | | | | | | | * commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed': movenc: remove pointless loop around BITEXACT test Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: remove pointless loop around BITEXACT testJohn Stebbins2014-08-06
| |
* | avcodec/svq1dec: Fix multiple bugs from "svq1: do not modify the input packet"Michael Niedermayer2014-08-07
| | | | | | | | | | | | Add padding, clear size, use the correct pointer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7b588bb691644e1b3c168b99accf74248a24e3cf'Michael Niedermayer2014-08-07
|\| | | | | | | | | | | | | * commit '7b588bb691644e1b3c168b99accf74248a24e3cf': svq1: do not modify the input packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * svq1: do not modify the input packetAnton Khirnov2014-08-06
| | | | | | | | | | | | | | | | | | | | | | 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
* | Merge commit 'c7d9b473e28238d4a4ef1b7e8b42c1cca256da36'Michael Niedermayer2014-08-07
|\| | | | | | | | | | | | | * commit 'c7d9b473e28238d4a4ef1b7e8b42c1cca256da36': cdgraphics: do not return 0 from the decode function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cdgraphics: do not return 0 from the decode functionAnton Khirnov2014-08-06
| | | | | | | | | | | | | | 0 means no data consumed, so it can trigger an infinite loop in the caller. CC:libav-stable@libav.org
* | Merge commit 'a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812'Michael Niedermayer2014-08-07
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a1599f3f7ea8478d1f6a95e59e3bc6bc86d5f812': cdgraphics: switch to bytestream2 Conflicts: libavcodec/cdgraphics.c See: ad002e1a13a8df934bd6cb2c84175a4780ab8942 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cdgraphics: switch to bytestream2Anton Khirnov2014-08-06
| | | | | | | | | | | | | | Fixes possible invalid memory accesses on corrupted data. CC:libav-stable@libav.org Bug-ID: CVE-2013-3674
* | libavcodec/rawdec: remove old ff_find_pix_fmt() functionJames Almer2014-08-07
| | | | | | | | | | | | | | 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>
* | avformat/dtsdec: check more of the dca headers in dts_probe()Michael Niedermayer2014-08-06
| | | | | | | | | | | | | | Fixes misdetection of 664461_flac_16_44100_2.wav Fixes Ticket3830 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dca: Make ff_dca_convert_bitstream() available to libavformat, ↵Michael Niedermayer2014-08-06
| | | | | | | | | | | | needed for dts_probe() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ed6d9ce914d552eeda16af857da97c4b1aea1e3f'Michael Niedermayer2014-08-06
|\| | | | | | | | | | | | | * commit 'ed6d9ce914d552eeda16af857da97c4b1aea1e3f': configure: Include the armcc build number in the compiler identification Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Include the armcc build number in the compiler identificationMartin Storsjö2014-08-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tries to find the most expressive part of the output of armcc --vsn to include, giving a compiler identification of "ARM Compiler 5.04 update 2 (build 82)" instead of just "ARM Compiler 5.04" for armcc 5.0. 4.x versions of armcc output the following, for "armcc --vsn": ARM C/C++ Compiler, RVCT4.0 [Build 925] For evaluation purposes only Software supplied by: ARM Limited ARM C/C++ Compiler, 4.1 [Build 894] For evaluation purposes only Software supplied by: ARM Limited 5.0 versions output this: Product: ARM Compiler 5.04 Component: ARM Compiler 5.04 update 2 (build 82) Tool: armcc [5040081] For evaluation purposes only Software supplied by: ARM Limited Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'cbc808d726afdf53d866264722785c1304c17390'Michael Niedermayer2014-08-06
|\| | | | | | | | | | | | | | | * commit 'cbc808d726afdf53d866264722785c1304c17390': jpeg2000: enable 4 component pixel formats See: f0358dc1d30cd4f4862489ab95c4d408b00a8b0d Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000: enable 4 component pixel formatsVittorio Giovara2014-08-06
| | | | | | | | | | | | Bug-Id: 721 CC: libav-stable@libav.org Sample-Id: 31230.mov
* | x86: sbrdsp/fft: reuse ps_neg constantChristophe Gisquet2014-08-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86: diracdsp: reuse constantsChristophe Gisquet2014-08-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86: dwt: better share constantsChristophe Gisquet2014-08-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86: better share ff_pw_2Christophe Gisquet2014-08-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86: vpx/h264/hevc/mpeg2: share constantsChristophe Gisquet2014-08-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: Change get_pixels() to ptrdiff_t linesizeMichael Niedermayer2014-08-06
| | | | | | | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/cpu: check av_parse_cpu_caps() table during cpu-testMichael Niedermayer2014-08-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/cpu: Make cpu flag names match between cpu-test and ↵Michael Niedermayer2014-08-06
| | | | | | | | | | | | av_parse_cpu_caps() tables Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/cpu: add aarch64 entries to 2nd tableMichael Niedermayer2014-08-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc_deblock: change tc typeChristophe Gisquet2014-08-06
| | | | | | | | | | | | | | The x86 asm expects int32_t so use that type. Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>