summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'Michael Niedermayer2014-03-1126-57/+117
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd92024f18fa3d69937cb2575f3a8bf973df02430': lavf: more correct printf format specifiers Conflicts: libavformat/asfdec.c libavformat/cafdec.c libavformat/dxa.c libavformat/framecrcenc.c libavformat/hnm.c libavformat/iff.c libavformat/mov.c libavformat/mxfdec.c libavformat/rmdec.c libavformat/rpl.c libavformat/smacker.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: more correct printf format specifiersDiego Biurrun2014-03-1126-57/+114
| |
* | avcodec/vorbisdec: use the stored previous window type only when the actual ↵Michael Niedermayer2014-03-111-7/+9
| | | | | | | | | | | | | | | | previous is not known Fixes Ticket3432 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avidec: Check required demuxing buffer sizes in guess_ni_flag()Michael Niedermayer2014-03-111-3/+14
| | | | | | | | | | | | Fixes Ticket3421 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avidec: calculate missing bitrates from indexMichael Niedermayer2014-03-111-0/+41
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-03-111-0/+3
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Decode png images without iend chunk. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Decode png images without iend chunk.Carl Eugen Hoyos2014-03-111-0/+3
| | | | | | | | | | | | Fixes ticket #3357.
* | | Documented av_dump_formatAnshul Maheshwari2014-03-111-1/+7
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Fix modplug linkage on Windows.Matt Oliver2014-03-111-0/+1
|/ / | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: support adob transform 2Michael Niedermayer2014-03-111-0/+22
| | | | | | | | | | | | Fixes Ticket3426 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: make it possible to disable xlib dependancyMichael Niedermayer2014-03-111-2/+7
| | | | | | | | | | | | The unconditional dependancy was added in 7671dd7cd7d51bbd637cc46d8f104a141bc355ea Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/APIchanges: fill in datesMichael Niedermayer2014-03-111-13/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-03-114-5/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | * cehoyos/master: Define ff_log2_run[] in libavcodec/internal.h. Replace an incorrect av_free() in movenc.c with av_freep(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Define ff_log2_run[] in libavcodec/internal.h.Carl Eugen Hoyos2014-03-103-4/+3
| | | | | | | | | | | | | | | This avoids defining the array with different sizes in different source files.
| * | Replace an incorrect av_free() in movenc.c with av_freep().Carl Eugen Hoyos2014-03-101-1/+1
| | |
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-111-28/+29
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | * qatar/master: configure: miscellaneous cosmetics Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | configure: miscellaneous cosmeticsDiego Biurrun2014-03-101-29/+30
| | | | | | | | | | | | | | | Sort lists of components. Add some whitespace where it helps readability. Consistently use double instead of single quotes around component lists.
* | | Merge commit '77e9123fe5d64b0960158de6e1713d3c6c7878a7'Michael Niedermayer2014-03-100-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * commit '77e9123fe5d64b0960158de6e1713d3c6c7878a7': lavf: always use av_free See: 88c8e4afeaf74ee58b67145e0331e229d8050968 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf: always use av_freeMichael Niedermayer2014-03-101-1/+1
| | | | | | | | | | | | Signed-off-by: Tim Walker <tdskywalker@gmail.com>
* | | Merge commit '34bbc81de8a49fbddb92b76dc733f40890480b2b'Michael Niedermayer2014-03-102-42/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '34bbc81de8a49fbddb92b76dc733f40890480b2b': lavf: simplify ff_hevc_annexb2mp4_buf Conflicts: libavformat/hevc.c libavformat/hevc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavf: simplify ff_hevc_annexb2mp4_bufTim Walker2014-03-102-42/+5
| | | | | | | | | | | | | | | | | | Use ff_hevc_annexb2mp4 instead of duplicating its functionality, and update the documentation to match the new behavior.
* | | Merge commit '4a8562394b685e83ae4a38a93eef43625755a231'Michael Niedermayer2014-03-100-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4a8562394b685e83ae4a38a93eef43625755a231': configure: Use the right pkgconf file for openjpeg Conflicts: configure No change as the incorrect code wasnt in ffmpegs configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | configure: Use the right pkgconf file for openjpegLuca Barbato2014-03-101-1/+1
| | | | | | | | | | | | The current release of version 1 uses libopenjpeg1.
* | | Merge commit 'ee17be3fdd37f63f4b77676820e387858908b0f4'Michael Niedermayer2014-03-101-5/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | * commit 'ee17be3fdd37f63f4b77676820e387858908b0f4': hevc: Use get_se_golomb_long Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | hevc: Use get_se_golomb_longLuca Barbato2014-03-101-5/+5
| | | | | | | | | | | | | | | Do not use inline functions that refer to tables present in other libraries.
* | | Merge commit '5eacbb53289570834f9a1acb15fd406ea224eef6'Michael Niedermayer2014-03-101-0/+12
|\ \ \ | |/ / | | / | |/ |/| | | | | * commit '5eacbb53289570834f9a1acb15fd406ea224eef6': golomb: Add a get_se_golomb_long Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * golomb: Add a get_se_golomb_longLuca Barbato2014-03-101-0/+12
| | | | | | | | Useful in libavformat mostly.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-103-0/+71
|\ \ | |/ | | | | | | | | | | * qatar/master: Work around broken floating point limits on some systems. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Work around broken floating point limits on some systems.Anton Khirnov2014-03-103-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | The values of {FLT,DBL}_{MAX,MIN} macros on some systems (older musl libc, some BSD flavours) are not exactly representable, i.e. (double)DBL_MAX == DBL_MAX is false This violates (at least some interpretations of) the C99 standard and breaks code (e.g. in vf_fps) like double f = DBL_MAX; [...] if (f == DBL_MAX) { // f has not been changed yet [....] }
* | Merge commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf'Michael Niedermayer2014-03-101-3/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf': mxfdec: Validate parameters to strftime Conflicts: libavformat/mxfdec.c See: 423089e964410adbf13af3de42e3c9dd5a1babd6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxfdec: Validate parameters to strftimeMartin Storsjö2014-03-101-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | The MSVCRT version of strftime calls the invalid parameter handler if the struct values in struct tm are invalid. In case no invalid parameter handler is set for the process, the process is aborted. This fixes fate failures on MSVC builds since 570af382. Based on a patch by Hendrik Leppkes. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Add fieldmatch testTimothy Gu2014-03-102-0/+66
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-091-0/+4
|\ \ | |/ | | | | | | | | | | * qatar/master: matroskaenc: enable Annex B to MP4 conversion for HEVC tracks. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.Tim Walker2014-03-091-0/+4
| |
* | Merge commit 'a823d0948683bd97dd58556b5740e434166209a8'Michael Niedermayer2014-03-092-1/+4
|\ \ | |/ | | | | | | | | | | * commit 'a823d0948683bd97dd58556b5740e434166209a8': matroskaenc: write private data in hvcC format for HEVC. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: write private data in hvcC format for HEVC.Tim Walker2014-03-092-1/+4
| |
* | avformat/hevc: fix mix of av_malloc() with free()Michael Niedermayer2014-03-091-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4f3db5d3418a24f3b90422e98ad75388052c4284'Michael Niedermayer2014-03-092-0/+2
|\ \ | |/ | | | | | | | | | | * commit '4f3db5d3418a24f3b90422e98ad75388052c4284': movenc: allow muxing HEVC in MODE_MP4. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: allow muxing HEVC in MODE_MP4.Tim Walker2014-03-092-0/+2
| |
* | avformat/hevc: Make return codes consistent and more flexibleMichael Niedermayer2014-03-091-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926'Michael Niedermayer2014-03-093-0/+158
|\ \ | |/ | | | | | | | | | | * commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926': movenc: enable Annex B to MP4 conversion for HEVC tracks. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: enable Annex B to MP4 conversion for HEVC tracks.Tim Walker2014-03-093-0/+158
| |
* | avformat: fix hevcs use of golomb from avformatMichael Niedermayer2014-03-092-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '20b40a597cdd4969cf1147d7c7efee2b6232524b'Michael Niedermayer2014-03-094-1/+1140
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '20b40a597cdd4969cf1147d7c7efee2b6232524b': movenc: write hvcC tag for HEVC. Conflicts: libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: write hvcC tag for HEVC.Tim Walker2014-03-094-1/+1140
| |
* | Merge commit '1d9014f0b008485eac4c19d5f5e11ede59237167'Michael Niedermayer2014-03-091-1/+1
|\ \ | |/ | | | | | | | | | | * commit '1d9014f0b008485eac4c19d5f5e11ede59237167': movenc: use 'hev1' tag for HEVC in MODE_MOV. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: use 'hev1' tag for HEVC in MODE_MOV.Tim Walker2014-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 'hvc1' requires that parameter set NAL units be present only in the samples entry, but not in the samples themselves, requiring that additional parameter sets, if present, be filtered out of the samples and placed in new, additional sample entries if they override or otherwise conflict with the parameter sets present in the first sample entry. We do not have any way of doing this at present, so the files we produce can only comply with the restrictions set for the 'hev1' sample entry name in ISO/IEC 14496-15.
* | Merge commit '3e0175d89a6c5ee8393ae05e1b40abdca1204919'Michael Niedermayer2014-03-090-0/+0
|\ \ | |/ | | | | | | | | | | | | * commit '3e0175d89a6c5ee8393ae05e1b40abdca1204919': riff: add VP9 fourcc See: eb7f7b797f0ae76a7cf6db7792365998ee6e9cba Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff: add VP9 fourccJames Zern2014-03-091-0/+1
| |
* | Merge commit 'fb0a988f94c3b8907610172295a7f6bf78c57105'Michael Niedermayer2014-03-090-0/+0
|\ \ | |/ | | | | | | | | | | | | * commit 'fb0a988f94c3b8907610172295a7f6bf78c57105': riff: IPJ2 decodes with JPEG2000 decoder See: b18c27def898e7499cf36b65b5debc4f303e7e5b Merged-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud