summaryrefslogtreecommitdiff
path: root/libavformat/matroskadec.c
Commit message (Collapse)AuthorAge
* avformat/matroskadec: fix off by 1 error in matroska_read_seek()Michael Niedermayer2014-05-30
| | | | | | | | | Fixes out of array read Fixes: vp9-opus-crash.webm Found-by: Dale Curtis <dalecurtis@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'Michael Niedermayer2014-05-28
|\ | | | | | | | | | | | | | | | | | | * commit '23f741f79327e31be7b2a75ebb2e02111e06e52f': matroskadec: parse the channel layout mask for FLAC Conflicts: libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: parse the channel layout mask for FLACAnton Khirnov2014-05-28
| | | | | | | | It is commonly stored in a vorbiscomment block in codec private data.
* | Merge commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0'Michael Niedermayer2014-05-28
|\| | | | | | | | | | | | | | | | | | | * commit '4efdadc8ec50332c812e8a95e8c67f5a260e7cb0': matroskadec: export just the STREAMINFO block as FLAC extradata Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: export just the STREAMINFO block as FLAC extradataAnton Khirnov2014-05-28
| | | | | | | | | | It contains all information that is used by the decoder and the other FLAC-capable demuxers (flacdec, ogg) export only STREAMINFO as well.
* | Merge commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c'Michael Niedermayer2014-05-28
|\| | | | | | | | | | | | | | | | | | | * commit '6df478bf891b9fc5626e4a0b993899f310ba0a1c': matroskadec: split parsing tracks into a separate function Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: split parsing tracks into a separate functionAnton Khirnov2014-05-28
| |
* | Merge commit 'eb3b5501e8b85bfea09d533314cb6920efc42639'Michael Niedermayer2014-05-01
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'eb3b5501e8b85bfea09d533314cb6920efc42639': matroskadec: read the CodecDelay element Conflicts: libavformat/matroska.h libavformat/matroskadec.c See: d6f86d74edfa6e1464ddc613726559269bf1dc7b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: read the CodecDelay elementAnton Khirnov2014-04-30
| |
* | Try mov tags if the fourcc in V_MS/VFW mkv files cannot be found in bmp tags.Carl Eugen Hoyos2014-04-27
| | | | | | | | Fixes decoding of broken mkv files containing ProRes video from ticket #3434.
* | Only insert the icpf atom in ProRes mkv packets if it isn't already present.Carl Eugen Hoyos2014-04-17
| | | | | | | | | | | | The patch allows to read broken mkv files containing ProRes as written by the Haali muxer. Fixes a part of ticket #3434.
* | Set Matroska private data when muxing Prores.Carl Eugen Hoyos2014-04-06
| | | | | | | | The specification requires the mov code point to be written as "fourcc".
* | Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'Michael Niedermayer2014-03-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-11
| |
* | Merge commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a'Michael Niedermayer2014-03-08
|\| | | | | | | | | | | | | | | | | | | * commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a': matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: cosmetics: Fix "attachement" vs. "attachment" typoDiego Biurrun2014-03-07
| |
* | Merge commit '84cfce9f99805a144df684417e166c1ae6f95421'Michael Niedermayer2014-03-07
|\| | | | | | | | | | | | | | | | | | | * commit '84cfce9f99805a144df684417e166c1ae6f95421': matroskadec: K&R formatting cosmetics Conflicts: libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: K&R formatting cosmeticsKeiji Costantini2014-03-07
| | | | | | | | | | | | Also sort #includes into canonical order. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * matroskadec: use correct compression parameters for current track CodecPrivateAurelien Jacobs2013-11-21
| | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * matroskadec: pad EBML_BIN data.Anton Khirnov2013-11-21
| | | | | | | | | | | | | | | | It might be passed to code requiring padding, such as lzo decompression. Fixes invalid reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | Read bits_per_coded_sample from V_MS/VFW/FOURCC mkv files.Carl Eugen Hoyos2014-02-26
| | | | | | | | Fixes ticket #3425.
* | avformat/matroskadec: identify SMI as SVQ3Michael Niedermayer2014-01-19
| | | | | | | | | | | | Fixes part of Ticket3256 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: support QDM2 as generated by mkvtoolnix-6.7.0Michael Niedermayer2014-01-19
| | | | | | | | | | | | Fixes part of Ticket3256 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: support SVQ3 as generated by mkvtoolnix-6.6.0Michael Niedermayer2014-01-19
| | | | | | | | | | | | Fixes part of Ticket3256 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Do not read mkv audio bit_depth if bits_per_coded_sample is already set.Carl Eugen Hoyos2014-01-15
| | | | | | | | This allows decoding broken mkv files containing G.726 audio.
* | avformat/matroskadec: check generic audio deinterleaver sub_packet_size ↵Michael Niedermayer2014-01-10
| | | | | | | | | | | | | | | | | | against frame_size Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f67d052a530_7517_nosound.mkv Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: Export the MuxingApp element value as metadataJames Almer2014-01-03
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: Fix bug when parsing realaudio codec parametersJames Almer2013-12-25
| | | | | | | | | | | | | | | | | | flavor can be 0. This fixes tract ticket #3214 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: Fix start_timeAlex Sukhanov2013-12-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/matroskadec ReferenceBlock is a signed integerJan Gerber2013-11-16
| | | | | | | | | | | | | | according to the Matroska Specification ReferenceBlock is a signed integer too. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/matroska*: DiscardPadding is a signed integerJan Gerber2013-11-16
| | | | | | | | | | | | | | | | | | | | according to the Matriska Specification http://matroska.org/technical/specs/index.html DiscardPadding is a signed integer. Tested-by: Jan Gerber <j@v2v.cc> Tested-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroska: simplify signed int access codeMichael Niedermayer2013-11-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/matroska*: add support for signed integersJan Gerber2013-11-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075': matroskadec: Support HEVC demuxing Conflicts: Changelog libavformat/matroskadec.c libavformat/version.h See: 16b6839de6767924c4640d6e9204b6eeb5c53910 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: Support HEVC demuxingYusuke Nakamura2013-10-31
| |
* | lavf/matroskadec: Support HEVC demuxing.Yusuke Nakamura2013-10-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: Demux support for SeekPreRoll and CodecDelayVignesh Venkatasubramanian2013-10-14
| | | | | | | | | | | | | | | | Adds support for demuxing SeekPreRoll and CodecDelay container elements. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: use ff_alloc_extradata()Paul B Mahol2013-10-13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/matroskadec: only set r_frame_rate if the value is within ↵Michael Niedermayer2013-10-06
| | | | | | | | | | | | | | | | reasonable limits Fixes Ticket2451 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '668643b9239c70b777aea322eab411ebc960d9a0'Michael Niedermayer2013-09-25
|\| | | | | | | | | | | | | * commit '668643b9239c70b777aea322eab411ebc960d9a0': matroskadec: check av_strdup() when setting defaults Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: check av_strdup() when setting defaultsAnton Khirnov2013-09-24
| |
* | matroska: Add the CueDuration elementJames Almer2013-09-21
| | | | | | | | | | | | | | | | | | Use it only on subtitle CuePoints. With proper demuxer/splitter support this should improve the display of subtitles right after seeking to a given point in the stream. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: correct spurious keyframe warnings in webmMonty Montgomery2013-09-20
| | | | | | | | | | | | | | | | | | | | | | Minor change to fix for Trac #1003 to avoid squawking about files with valid keyframes that aren't marked (as opposed to frames that are marked as keyframes and aren't). Change correctly surpresses the spurious warnings, while still complaining about (and handling) the genuinely broken file attached to bug #1003. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: use av_malloc_array() and check for allocation errorPaul B Mahol2013-09-19
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '569d18aa9dc989c37bb4d4b968026fe5afa6fff9'Michael Niedermayer2013-09-17
|\| | | | | | | | | | | | | * commit '569d18aa9dc989c37bb4d4b968026fe5afa6fff9': matroskadec: Verify realaudio codec parameters Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: Verify realaudio codec parametersMartin Storsjö2013-09-17
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | matroskadec: Mute "Unknown entry" log messages for CueRelativePosition entriesJames Almer2013-09-15
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: use av_realloc_array()Michael Niedermayer2013-09-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/matroskadec: ebml_parse_elem() should not deallocate priorly ↵Michael Niedermayer2013-09-11
| | | | | | | | | | | | | | | | existing lists on failure This reverts a hunk from "avformat: Use av_reallocp_array() where suitable" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f369b9356c4606cd4d713d60f7db5de119d901fa'Michael Niedermayer2013-09-11
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'f369b9356c4606cd4d713d60f7db5de119d901fa': avformat: Use av_reallocp_array() where suitable Conflicts: libavformat/asfenc.c libavformat/gxfenc.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-17 01:43:44 +0000