summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'a05f5052fef3b3743fab7846da12861d8a8098ec'Michael Niedermayer2014-09-29
|\ | | | | | | | | | | | | * commit 'a05f5052fef3b3743fab7846da12861d8a8098ec': sdp: Make opus declaration conform to the spec Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sdp: Make opus declaration conform to the specTimothy B. Terriberry2014-09-29
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/put_bits: Add rebase_put_bits()Michael Niedermayer2014-09-29
| | | | | | | | | | Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utils: Fix off by 1 error causing unneeded allocation in ↵Michael Niedermayer2014-09-29
| | | | | | | | | | | | | | ff_fast_malloc() Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hlsenc: fix outter typoMichael Niedermayer2014-09-29
| | | | | | | | | | Found-by: beastd Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo_enc: Only enforce rc_max_available_vbv_use on first ↵Michael Niedermayer2014-09-28
| | | | | | | | | | | | | | | | encoding attempt This reduces repeatly re-encoding to achieve VBV compliance Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hlsenc: export inner muxer timebaseMichael Niedermayer2014-09-28
| | | | | | | | | | | | | | Fixes "Non-monotonous DTS in output stream 0:0" Fies Ticket 3797 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/lls: Make unchanged function arguments constMichael Niedermayer2014-09-28
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/x86/fmtconvert: Fix operand size in ff_int32_to_float_fmul_array8_sse*Michael Niedermayer2014-09-28
| | | | | | | | | | | | Fixes acodec-dca2 fate failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/pca: Make argument of ff_pca_add() constMichael Niedermayer2014-09-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vc1dec: Fixing is_intra, 2nd attemptMichael Niedermayer2014-09-28
| | | | | | | | | | | | | | | | This also un-does the fate changes from a52f443714b5c2a40ed272d8445f4c39220a4b69, leaving this fix without even small differences in the output, that is a sample for which this makes a vissible difference is very welcome Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vc1dec: fix is_intra block vs. mb bugMichael Niedermayer2014-09-28
| | | | | | | | | | | | | | | | | | | | Fixes CID1194380 There are no vissible differences in the changed fate samples. Only a tiny number of pixels change by tiny amounts in the frames i checked If someone has a file that shows a vissible difference, please post it. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: add noexecstack to linker options if supported.Reimar Döffinger2014-09-28
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | avcodec/libx265: enable psnr reporting when requested by the userMichael Niedermayer2014-09-28
| | | | | | | | | | | | | | | | This is similar to what is done in libx264.c Fixes Ticket3567 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libx264: mark unchanged pointer arguments as constMichael Niedermayer2014-09-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hlsenc: Added parameter -hls_allow_cacheJoakim Roubert2014-09-28
| | | | | | | | | | | | | | | | | | | | | | | | | | The -hls_allow_cache parameter enables explicitly setting the EXT-X-ALLOW-CACHE tag in the manifest file. That tag indicates whether the client MAY or MUST NOT cache downloaded media segments for later replay. Valid values are 1 (=YES) or 0 (=NO) and the EXT-X-ALLOW-CACHE will not show in the manifest for other values (or if -hls_allow_cache is not used. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/avfoundation: Add basic PCM audio support.Thilo Borgmann2014-09-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ac3enc_template: fix out of array readMichael Niedermayer2014-09-27
| | | | | | | | | | Found-by: Andreas Cadhalpun Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '551746680462538bb5ad7adf55fb1248190428ec'Michael Niedermayer2014-09-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '551746680462538bb5ad7adf55fb1248190428ec': configure: Provide a safe default for unknonw libcs Conflicts: configure This is not merged as it does not work with musl here, while our previous solution does. See: 170e2fd7c39c430b334ea80a1e4dfb10c6fd1e95 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Provide a safe default for unknonw libcsLuca Barbato2014-09-27
| | | | | | | | | | | | | | Support musl out of box. Amend commit 9d2cee52d37c7340f85a5d41110282aac03e6855 that got wrongly merged in its stead.
* | avcodec/subviewerdec: remove old compat codeClément Bœsch2014-09-27
| |
* | avcodec/microdvddec: remove old compat codeClément Bœsch2014-09-27
| |
* | avformat/assdec: make sure to free allocated data in case of errorClément Bœsch2014-09-27
| |
* | avformat/assenc: mux an event header if none are found in extradataClément Bœsch2014-09-27
| |
* | avformat/assdec: add myself to CopyrightClément Bœsch2014-09-27
| |
* | avformat/assdec: reindent after previous commitClément Bœsch2014-09-27
| |
* | avformat/assdec: make sure "Comments:" events end up in the headerClément Bœsch2014-09-27
| |
* | avformat/assdec: output ASS packetsClément Bœsch2014-09-27
| | | | | | | | | | | | | | | | After this the order from the original file is stored through readorder when doing ffmpeg -i input.ass -c copy output.mkv. And now that the ASS muxer honors the ReadOrder, extracting the ass back (without transcoding) restores the original order.
* | avutil/x86/cpu: fix cpuid sub-leaf selectionlvqcl2014-09-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tests/fate/microsoft: add -flags +bitexact to ilaced_twomvMichael Niedermayer2014-09-27
| | | | | | | | | | | | Should fix fate failure on alpha and pre sse2 x86 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevc: remove CodingTreeChristophe Gisquet2014-09-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/signalstats: add more pixel formatsPaul B Mahol2014-09-27
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ffplay: Separate AVFrame from AVSubtitleMichael Niedermayer2014-09-27
| | | | | | | | | | | | | | | | | | | | This is more robust and should avoid false positives in coverity That is if the type is ever mixed up, after this patch that would just be a null pointer dereference instead of a random possibly out of array access Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4e03b2097ca59843ed65424a572b7acd5345f088'Michael Niedermayer2014-09-27
|\| | | | | | | | | | | | | | | | | | | * commit '4e03b2097ca59843ed65424a572b7acd5345f088': mpeg12: Always invoke the get_format() callback Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12: Always invoke the get_format() callbackRémi Denis-Courmont2014-09-26
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'ce42316321145c435029dc288c2b5f1d48519dde'Michael Niedermayer2014-09-27
|\| | | | | | | | | | | | | | | | | | | * commit 'ce42316321145c435029dc288c2b5f1d48519dde': h264: Always invoke the get_format() callback Conflicts: libavcodec/h264_slice.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Always invoke the get_format() callbackRémi Denis-Courmont2014-09-26
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2'Michael Niedermayer2014-09-27
|\| | | | | | | | | | | | | | | | | | | * commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2': hwaccel: Call ->get_format again if hwaccel init fails Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hwaccel: Call ->get_format again if hwaccel init failsRémi Denis-Courmont2014-09-26
| | | | | | | | | | | | | | This allows the application to fall back on another hwaccel or, more likely, software decoding. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '9d2cee52d37c7340f85a5d41110282aac03e6855'Michael Niedermayer2014-09-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '9d2cee52d37c7340f85a5d41110282aac03e6855': configure: Assume a standard-compliant default libc See: 170e2fd7c39c430b334ea80a1e4dfb10c6fd1e95 Note, the change is not merged to avoid breaking netbsd and others. once the netbsd (and any other breakages are dealt with the else based solution could be used and 170e2fd7c39c430b334ea80a1e4dfb10c6fd1e95 could then be reverted) Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Assume a standard-compliant default libcLuca Barbato2014-09-26
| | | | | | | | | | Non-standard compliant libc should be supported on a per-case basis anyway.
* | Merge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8'Michael Niedermayer2014-09-27
|\| | | | | | | | | | | | | | | | | | | * commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8': avconv: Use only audio and video to guess discontinuities Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: Use only audio and video to guess discontinuitiesLuca Barbato2014-09-26
| | | | | | | | Data and subtitle streams might cause false positive.
* | x86/fmtconvert: add ff_int32_to_float_fmul_array8_{sse,sse2}James Almer2014-09-26
| | | | | | | | | | | | | | About two times faster than the c wrapper. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '883e98bc25755327565d8ae0f565a6c886f24816'Michael Niedermayer2014-09-27
|\| | | | | | | | | | | | | | | | | | | | | * commit '883e98bc25755327565d8ae0f565a6c886f24816': probe: Bump the score for mime type matching Conflicts: libavformat/format.c See: bcac0f401001e6ebb0ae2718cc42d30b2009de4b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * probe: Bump the score for mime type matchingAndreas Cadhalpun2014-09-26
| | | | | | | | | | | | It should be more trustworthy than extension matching. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'd995f0a1550c9148140eab34c7d770e90925c004'Michael Niedermayer2014-09-27
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd995f0a1550c9148140eab34c7d770e90925c004': log: Unbreak no-tty support on 256color terminals Conflicts: libavutil/log.c No change, FFmpeg is not affected by this bug Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * log: Unbreak no-tty support on 256color terminalsLuca Barbato2014-09-26
| |
* | libavfilter/af_amix: avoid derreferencing possible nullReynaldo H. Verdejo Pinochet2014-09-26
| | | | | | | | | | | | | | | | ff_all_channel_layouts() might return null on alloc failure. Fixes CID1241516 Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
* | libavfilter/af_channelmap: avoid derreferencing possible nullReynaldo H. Verdejo Pinochet2014-09-26
| | | | | | | | | | | | | | | | ff_all_channel_layouts() might return null on alloc failure. Fixes CID1241517 Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>