summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * movenc: Allow setting start_dts/start_cts before writing actual packetsMartin Storsjö2015-11-111-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By writing a zero-sized packet, the caller can communicate the start_dts/start_cts for the stream without actually writing the first packet. This allows doing random-access writing of fragments when the start dts of the stream isn't zero, so that the edit list in the moov is written based on timestamps from the nominal start time signaled via the zero-sized packet, while the first proper packet written corresponds to a later fragment. To avoid potential unexpected behaviour, empty packets only set start_dts if the frag_discont flag is set. Signed-off-by: Martin Storsjö <martin@martin.st>
* | movenc-test: Pad the packet data start with 0sDerek Buitenhuis2015-11-182-23/+23
| | | | | | | | | | | | | | This way, it never starts with 0xFFF0, and never trips the ADTS "Detection" code in movenc.c. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avformat/genh: Fix tools/probetest failureMichael Niedermayer2015-11-181-0/+2
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/dashenc: Add framerate to dash manifestBryan Huh2015-11-181-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | DASH manifest should have framerate specified as an attribute in the AdaptationSet element and Representation elements. Though ISO/IEC 23009-1:2014 doesn't seem to define frameRate as a required attribute, it is at least optional, and DASH-IF IOP 3.0 seems to require it. See section 3.2.4 of http://dashif.org/w/2015/04/DASH-IF-IOP-v3.0.pdf In the event that avg_frame_rate is not set in the muxer, we ignore the frameRate tag altogther. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat: add IVR demuxerPaul B Mahol2015-11-186-35/+280
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/faandct: use typedef instead of #defineGanesh Ajjanagadde2015-11-171-1/+1
| | | | | | | | | | | | | | | | See e.g https://stackoverflow.com/questions/1666353/are-typedef-and-define-the-same-in-c for rationale. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | avformat/rtpdec_mpa_robust: change assignment to inequality test in conditionalGanesh Ajjanagadde2015-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | In the spirit of commit 8199908fdf9b3797cceaea9d1e2fc09d02ef7309, likely typo originally. Found by enabling -Wparentheses on clang 3.7 and running a manual audit. To the best of my knowledge, no such instances remain. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | avformat/matroskadec: Check subtitle stream before dereferencingMichael Niedermayer2015-11-171-0/+1
| | | | | | | | | | | | | | | | Unrecognized streams are not allocated Fixes: flicker-1.color1.vp91447030769.08.webm Found-by: Chris Cunningham <chcunningham@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '3eeb7edfc2a1157b7b0e0ce21ac2cd44d55d405b'Derek Buitenhuis2015-11-172-0/+38
|\ \ | |/ | | | | | | | | | | * commit '3eeb7edfc2a1157b7b0e0ce21ac2cd44d55d405b': movenc: Add a unit test for frag_discont with edit lists Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * movenc: Add a unit test for frag_discont with edit listsMartin Storsjö2015-11-112-0/+38
| | | | | | | | | | | | | | This tests the case where the muxer correctly guesses that a stream starts at pts=0. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '09e431b9e3674804172e7b0a0f865b65ec09739a'Derek Buitenhuis2015-11-171-4/+12
|\ \ | |/ | | | | | | | | | | * commit '09e431b9e3674804172e7b0a0f865b65ec09739a': movenc: Assume streams starting at pts=0 for discontinuous fragments with editlists Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * movenc: Assume streams starting at pts=0 for discontinuous fragments with ↵Martin Storsjö2015-11-111-4/+12
| | | | | | | | | | | | | | | | | | | | editlists This allows producing fragments discontinously where the video stream has b-frames (but starts at pts=0), but doesn't work for the cases with audio with preroll. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/internal: Fix skiped typoMichael Niedermayer2015-11-171-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate: update fate-source reference fileJames Almer2015-11-161-1/+0
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/movenc-test: fix copyright headerJames Almer2015-11-161-4/+4
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/pngdec: Replace assert by request for sample for unsupported TRNS casesMichael Niedermayer2015-11-161-1/+4
| | | | | | | | | | | | | | | | Fixes assertion failure Fixes: 7f646252a30ee28b583aac1f82e7985e/signal_sigabrt_7ffff6ae7cc9_7353_62fc077bf2f454d39e188c69807193a6.png Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate: fix concat demuxer extended test portabilityMarton Balint2015-11-161-1/+1
| | | | | | | | | | | | Sed \r is not portable, it does not work on freebsd, hopefully tr -d will. Signed-off-by: Marton Balint <cus@passwd.hu>
* | Merge commit '59e8ec0aa8ab174701d01a3bfe96fedd0b7fcead'Derek Buitenhuis2015-11-165-0/+618
|\ \ | |/ | | | | | | | | | | | | | | All diferences in unit tests have been acounted for. * commit '59e8ec0aa8ab174701d01a3bfe96fedd0b7fcead': movenc: Add an API unit test for fragmenting options/calls Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * movenc: Add an API unit test for fragmenting options/callsMartin Storsjö2015-11-104-0/+613
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contrary to the normal fate tests that run via avconv, this tests nontrivial call sequences that are only doable via the API (mainly for different corner cases when using the muxer for segmenting). The test muxes fake packet data (with extradata that looks enough like proper data to make the file be viewable with e.g. boxdumper) and checks the hash of the produced files. The test also verifies that fragments produced via different call sequences remain identical (to avoid e.g. updating the output hashes and suddenly having fragments that used to be identical suddenly diverging), for fragments written with frag_discont and/or delay_moov. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/mov: remove redundant assignmentGanesh Ajjanagadde2015-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | This is possibly undefined behavior based on sequence point rules, but I have not studied the spec at that level of detail. Fixes: CID 1338321. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | avformat/mov: fix memory leakGanesh Ajjanagadde2015-11-161-0/+1
| | | | | | | | | | | | | | Fixes: CID 1338328. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | avformat/aviobuf: Simplify avio_read() and avio_seek()Bryan Huh2015-11-161-5/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/aviobuf: Improve readability of aviobuf (Add comments and docs)Bryan Huh2015-11-162-2/+52
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate: fix concat demuxer extended tests on windowsMarton Balint2015-11-161-1/+1
| | | | | | | | | | | | Line endings do matter to md5sum... Signed-off-by: Marton Balint <cus@passwd.hu>
* | fate: fix concat demuxer tests on msys/cygwin by using relative pathsMarton Balint2015-11-162-4/+4
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | ffmpeg: Simplify fps code related to delta0Bryan Huh2015-11-161-6/+5
| | | | | | | | | | | | | | | | Small refactor of fps code for improved readability. In particular the "cor" variable was unnecessary and misleading because it would always be set to -delta0. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Fixing typos and adding comments to fps codeBryan Huh2015-11-162-9/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | mpegtsenc: add vc-1 support to MPEG-TS muxer (ticket 2141)Hagen Schmidt2015-11-161-0/+10
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/utils: Do not init parser if probing is unfinishedMichael Niedermayer2015-11-151-1/+1
| | | | | | | | | | | | | | | | Fixes assertion failure Fixes: 136f8b8d47af7892306625e597dee655/signal_sigabrt_7ffff6ae7cc9_8941_ab11bea57c84796418f481f873dc31ba.dvr_ms Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/jpeg2000: Change coord to 32bit to support larger than 32k width or ↵Michael Niedermayer2015-11-155-19/+20
| | | | | | | | | | | | | | | | | | height Fixes: 03e0abe721b1174856d41a1eb5d6a896/signal_sigabrt_7ffff6ae7cc9_3813_e71bf3541abed3ccba031cd5ba0269a4.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/jpeg2000dec: Fix potential integer overflow with tile dimensionsMichael Niedermayer2015-11-151-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/jpeg2000dec: Check SIZ dimensions to be within the supported rangeMichael Niedermayer2015-11-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | Fixes potential integer overflows Fixes: 03e0abe721b1174856d41a1eb5d6a896/signal_sigabrt_7ffff6ae7cc9_3813_e71bf3541abed3ccba031cd5ba0269a4.avi This fix is choosen to be simple to backport, better solution for master is planed Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/jpeg2000: Check comp coords to be within the supported sizeMichael Niedermayer2015-11-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | Fixes assertion failure Fixes: 03e0abe721b1174856d41a1eb5d6a896/signal_sigabrt_7ffff6ae7cc9_3813_e71bf3541abed3ccba031cd5ba0269a4.avi This fix is choosen to be simple to backport, better solution for master is planed Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/jpeg2000: Use av_image_check_size() in ff_jpeg2000_init_component()Michael Niedermayer2015-11-151-1/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate: add concat demuxer testsMarton Balint2015-11-1511-0/+546
| | | | | | | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avcodec/wmaprodec: Check for overread in decode_packet()Michael Niedermayer2015-11-151-0/+5
| | | | | | | | | | | | | | | | Fixes assertion failure Fixes: 0256e92df2df7e933b43a2c70e4c8040/signal_sigabrt_7ffff6ae7cc9_1358_999ac18684788221490757582ce9af84.wma Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | swresample/resample: remove redundant L for floating literalGanesh Ajjanagadde2015-11-151-2/+2
| | | | | | | | | | | | | | It is inherently double precision, and 1.0 is perfectly represented anyway. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | avcodec/faandct: use more accurate constantsGanesh Ajjanagadde2015-11-151-16/+13
| | | | | | | | | | | | | | This guarantees a "best effort precision". Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | avformat/utils: estimate_timings_from_pts - increase retry counter, fixes ↵Rainer Hochecker2015-11-151-1/+1
| | | | | | | | | | | | | | | | | | invalid duration for ts files with hevc codec Fixes a mpegts file with hevc that fails estimating duration. Increasing number of retries fixes the issue. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/smacker: Check that the data size is a multiple of a sample vectorMichael Niedermayer2015-11-151-0/+4
| | | | | | | | | | | | | | | | Fixes out of array access Fixes: ce19e41f0ef1e52a23edc488faecdb58/asan_heap-oob_2504e97_4202_ffa0df1baed14022b9bfd4f8ac23d0cb.smk Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | mpegvideo: clear overread in clear_contextAndreas Cadhalpun2015-11-151-0/+1
| | | | | | | | | | | | | | | | Otherwise the h263p decoder can try to copy overread bytes, even though buffer is NULL. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | lavc/pngdec: set FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM capabilityMatthieu Bouron2015-11-151-0/+1
| |
* | lavc/mjpegdec: set FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM capabilityMatthieu Bouron2015-11-151-1/+2
| |
* | lavc/internal: add FF_CODEC_CAP_SKIP_FRAME_FILL_PARAMMatthieu Bouron2015-11-151-0/+5
| | | | | | | | | | The decoder extracts and fills its parameters even if the frame is skipped due to the skip_frame setting.
* | avutil: Move av_rint64_clip_* to internal.hMichael Niedermayer2015-11-152-39/+37
| | | | | | | | | | | | | | | | | | | | The function is renamed to ff_rint64_clip() This should avoid build failures on VS2012 Feel free to changes this to a different solution Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/takdec: Skip last p2 sample (which is unused)Michael Niedermayer2015-11-151-1/+1
| | | | | | | | | | | | | | | | Fixes out of array read Fixes: cb3f38b08b4541523974667c7d1eee9e/asan_heap-oob_2659e18_9838_021fd5cd635bf76cede6398cd9ecbcdd.tak Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/dxtory: Fix input size check in dxtory_decode_v1_410()Michael Niedermayer2015-11-151-1/+1
| | | | | | | | | | | | Fixes potential out of array read Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/dxtory: Fix input size check in dxtory_decode_v1_420()Michael Niedermayer2015-11-151-1/+1
| | | | | | | | | | | | | | | | Fixes out of array read Fixes: c50c4aa6cefda71b19a31ea12302980c/asan_heap-oob_12be5fd_7011_33ebd015a74976215934add72b9c8352.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/error_resilience: avoid accessing previous or next frames tables ↵Michael Niedermayer2015-11-141-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | beyond height The height of tables can be rounded up for MBAFF but this does not imply that is also true for the previous frames Fixes out of array reads Fixes: c106b36fa36db8ff8f3ed0c82be7bea2/asan_heap-oob_32699f0_6321_467b9a1d7e03d7cfd310b7e65dc53bcc.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | dds: disable palette flag for compressed ddsAndreas Cadhalpun2015-11-141-0/+6
| | | | | | | | | | | | | | | | Having both is not valid and can cause a NULL pointer dereference of frame->data[1] later. Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
OpenPOWER on IntegriCloud