summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* avformat/ftp: return AVERROR_EOF for EOFMarton Balint2018-11-011-2/+2
| | | | | | | Without this FTP just hangs on eof... Signed-off-by: Marton Balint <[email protected]> (cherry picked from commit 6a034adf7516fde8733064ed7ba5c77554298047)
* avformat/utils: Never store negative values in last_IP_durationMichael Niedermayer2018-10-231-2/+3
| | | | | | | | | | Fixes: integer overflow compute_pkt_fields() Fixes: compute_pkt_usan Reported-by: Thomas Guilbert <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 079d1a7175c4b881631a7e7f449c4c13b761cdeb) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/utils: Fix integer overflow in discontinuity checkMichael Niedermayer2018-10-231-1/+1
| | | | | | | | | | Fixes: signed integer overflow: 7738135736989908991 - -7954308516317364223 cannot be represented in type 'long' Fixes: find_stream_info_usan Reported-by: Thomas Guilbert <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 4e19cfcfa3944fe4cf97bea758f72f104dcaebad) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/utils: Fix potential integer overflow in extract_extradata()Michael Niedermayer2018-10-071-1/+3
| | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 0a41a8bf2945e59db7a0773ebce11a26b95d45b6) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/mov: Error on too large stsd entry counts.Dale Curtis2018-10-071-1/+2
| | | | | | | | | | | | | | Entries are always at least 8 bytes per the parsing code, so if we see an impossible entry count avoid massive allocations. This is similar to an existing check in mov_read_stsc(). Since ff_mov_read_stsd_entries() does eof checks, an alternative approach could be to clamp the entry count to atom.size / 8. Signed-off-by: Dale Curtis <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 320b631a99a9f759fd1d5460fd4e285d184b8186) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/nsvdec: Do not parse multiple NSVfMichael Niedermayer2018-10-071-0/+7
| | | | | | | | | | | | The specification states "NSV files may contain a single file header. " Fixes: out of array access Fixes: nsv-asan-002f473f726a0dcbd3bd53e422c4fc40b3cf3421 Found-by: Paul Ch <[email protected]> Tested-by: Paul Ch <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 78d4b6bd43fc266a2ee926f0555c8782246f9445) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/dashdec: Fix strlen(rep_id_val) with it being NULLMichael Niedermayer2018-10-071-1/+3
| | | | | | | | | | Fixes: dash-crash-da39a3ee5e6b4b0d3255bfef95601890afd80709.xml Found-by: Paul Ch <[email protected]> Reviewed-by: Steven Liu <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 46753bfdd0182f721499939a1118c0406c8a3674) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/mlvdec: read_string() received unsigned size, make the argument ↵Michael Niedermayer2018-10-071-1/+1
| | | | | | | | | | | | | unsigned Fixes: infinite loop Fixes: mlv-timeout-e3b8cab9835edecad6823baa057e029671329d04 Found-by: Paul Ch <[email protected]> Reviewed-by: Paul B Mahol <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 1e71cb2c8edcf3dad657c15a6fb8572862f2afb9) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/rmdec: Fix EOF check in the stream loop in ivr_read_header()Michael Niedermayer2018-10-071-0/+2
| | | | | | | | | | | Fixes: long running loop Fixes: ivr-timeout-42468cb797f52f025fb329394702f5d4d64322d6 Found-by: Paul Ch <[email protected]> Reviewed-by: Paul B Mahol <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit c2eec1762d372663c35aaf3d6ee419bafb185057) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/flvenc: Check audio packet sizeMichael Niedermayer2018-10-071-0/+5
| | | | | | | | | | Fixes: Assertion failure Fixes: assert_flvenc.c:941_1.swf Found-by: #CHEN HONGXU# <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 6b67d7f05918f7a1ee8fc6ff21355d7e8736aa10) Signed-off-by: Michael Niedermayer <[email protected]>
* lavf/libsmbclient: return AVERROR_EOF for EOF.Nicolas George2018-09-021-1/+1
| | | | Fix trac ticket #7387.
* avformat/librtmp: fix returning EOF from Read/WriteTimo Rothenpieler2018-07-281-2/+8
| | | | Ticket #7052
* avformat/mov: Simplify last element computation in mov_estimate_video_delay()Michael Niedermayer2018-07-161-3/+2
| | | | | | | | Reviewed-by: Derek Buitenhuis <[email protected]> Reviewed-by: Sasi Inguva <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit b0644f7f72a9ae64c7285d26ec720441c25d4cf5) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/mov: Break out of inner loop early in mov_estimate_video_delay()Michael Niedermayer2018-07-161-0/+2
| | | | | | | | | | | | 0.266 <- 0.299 sec (this is time ffmpeg so containing alot other things) Sample for benchmark was: ffmpeg -f rawvideo -pix_fmt yuv420p -s 32x32 -i /dev/zero -t 24:00:00.00 out.mp4 Reviewed-by: Derek Buitenhuis <[email protected]> Reviewed-by: Sasi Inguva <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit aba13dc13e5233545bdd06f514e0addbb0155c69) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/mov: Eliminate variable buf_size from mov_estimate_video_delay()Michael Niedermayer2018-07-161-11/+8
| | | | | | | | Reviewed-by: Derek Buitenhuis <[email protected]> Reviewed-by: Sasi Inguva <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 3ce4034308a3726395a2c1b18a3dff3554e0b619) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/mov: remove modulo operations from mov_estimate_video_delay()Michael Niedermayer2018-07-161-3/+7
| | | | | | | | | | 0.324 <-0.491 sec Reviewed-by: Derek Buitenhuis <[email protected]> Reviewed-by: Sasi Inguva <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit c995e01b1e01ac11cf2545b3ce86569a482ff434) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/movenc: Write version 2 of audio atom if channels is not knownMichael Niedermayer2018-07-161-1/+1
| | | | | | | | | | | | | The version 1 needs the channel count and would divide by 0 Fixes: division by 0 Fixes: fpe_movenc.c_1108_1.ogg Fixes: fpe_movenc.c_1108_2.ogg Fixes: fpe_movenc.c_1108_3.wav Found-by: #CHEN HONGXU# <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit fa19fbcf712a6a6cc5a5cfdc3254a97b9bce6582) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/movenc: Check input sample countMichael Niedermayer2018-07-161-0/+5
| | | | | | | | | | | | | | | | Fixes: division by 0 Fixes: fpe_movenc.c_199_1.wav Fixes: fpe_movenc.c_199_2.wav Fixes: fpe_movenc.c_199_3.wav Fixes: fpe_movenc.c_199_4.wav Fixes: fpe_movenc.c_199_5.wav Fixes: fpe_movenc.c_199_6.wav Fixes: fpe_movenc.c_199_7.wav Found-by: #CHEN HONGXU# <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 3a2d21bc5f97aa0161db3ae731fc2732be6108b8) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/mms: Add missing chunksize checkMichael Niedermayer2018-07-161-18/+26
| | | | | | | | | | | | Fixes: out of array read Fixes: mms-crash-01b6c5d85f9d9f40f4e879896103e9f5b222816a Found-by: Paul Ch <[email protected]> 1st hunk by Paul Ch <[email protected]> Tested-by: Paul Ch <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit cced03dd667a5df6df8fd40d8de0bff477ee02e8) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/pva: Check for EOF before retrying in read_part_of_packet()Michael Niedermayer2018-07-161-0/+4
| | | | | | | | | | Fixes: Infinite loop Fixes: pva-4b1835dbc2027bf3c567005dcc78e85199240d06 Found-by: Paul Ch <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 9807d3976be0e92e4ece3b4b1701be894cd7c2e1) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/rmdec: Do not pass mime type in rm_read_multi() to ↵Michael Niedermayer2018-07-161-1/+1
| | | | | | | | | | | | ff_rm_read_mdpr_codecdata() Fixes: use after free() Fixes: rmdec-crash-ffe85b4cab1597d1cfea6955705e53f1f5c8a362 Found-by: Paul Ch <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit a7e032a277452366771951e29fd0bf2bd5c029f0) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/asfdec_o: Check size_bmp more fullyMichael Niedermayer2018-07-161-1/+2
| | | | | | | | | | Fixes: integer overflow and out of array access Fixes: asfo-crash-46080c4341572a7137a162331af77f6ded45cbd7 Found-by: Paul Ch <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 2b46ebdbff1d8dec7a3d8ea280a612b91a582869) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/mxfdec: Fix av_log contextMichael Niedermayer2018-07-161-1/+1
| | | | | | | | | | Fixes: out of array access Fixes: mxf-crash-1c2e59bf07a34675bfb3ada5e1ec22fa9f38f923 Found-by: Paul Ch <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit bab0716c7f4793ec42e05a5aa7e80d82a0dd4e75) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/movenc: Use mov->fc consistently for av_log()Michael Niedermayer2018-07-161-1/+1
| | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 872ea3dfe565098570ad213a6f1eb00a805aec5d) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/movenc: Do not pass AVCodecParameters in avpriv_request_sampleMichael Niedermayer2018-07-161-1/+1
| | | | | | | | | | Fixes: out of array read Fixes: ffmpeg_crash_8.avi Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan Caciulescu with AFLSmart Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 95556e27e2c1d56d9e18f5db34d6f756f3011148) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/movenc: Check that frame_types other than ↵Michael Niedermayer2018-07-161-0/+6
| | | | | | | | | | | | EAC3_FRAME_TYPE_INDEPENDENT have a supported substream id Fixes: out of array access Fixes: ffmpeg_bof_1.avi Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan Caciulescu with AFLSmart Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit ed22dc22216f74c75ee7901f82649e1ff725ba50) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/mpegts: parse large PMTs with multiple tablesAman Gupta2018-06-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 9152c1e4955, the mpegts parser was taught how to parse PMT sections which contained multiple tables. That commit fixed parsing of PMT packets from some cable providers, which included a special SCTE table (0xc0) before the standard program map table (0x2). Sometimes, however, the combined 0xc0 and 0x2 tables are larger than a single TS packet (188 bytes). The mpegts parser already attempts to parse sections which span multiple packets, but still assumed that the split section only contained one table. This patch fixes parsing of such a sample[1]. Before: Input #0, mpegts, from 'combined-pmt-tids-split.ts': Duration: 00:00:01.26, start: 39188.931756, bitrate: 597 kb/s Program 1 No Program Stream #0:0[0xeff]: Audio: ac3, 48000 Hz, mono, fltp, 64 kb/s Stream #0:1[0xefd]: Audio: mp3, 0 channels, fltp Stream #0:2[0xefe]: Unknown: none After: Input #0, mpegts, from 'combined-pmt-tids-split.ts': Duration: 00:00:01.27, start: 39188.931756, bitrate: 589 kb/s Program 1 Stream #0:0[0xefd]: Video: h264 ([27][0][0][0] / 0x001B), none, 59.94 fps, 59.94 tbr, 90k tbn, 180k tbc Stream #0:1[0xefe](eng): Audio: ac3 ([129][0][0][0] / 0x0081), 48000 Hz, stereo, fltp, 384 kb/s Stream #0:2[0xeff](spa): Audio: ac3 ([129][0][0][0] / 0x0081), 48000 Hz, mono, fltp, 64 kb/s Stream #0:3[0xf00]: Data: scte_35 Stream #0:4[0xf01]: Unknown: none (ETV1 / 0x31565445) Stream #0:5[0xf02]: Unknown: none (ETV1 / 0x31565445) Stream #0:6[0xf03]: Unknown: none ([192][0][0][0] / 0x00C0) With the patch, the PMT is parsed correctly so the streams are created in the correct order, are associated with "Program 1", and their codecs are set correctly. [1] https://s3.amazonaws.com/tmm1/combined-pmt-tids-split.ts Signed-off-by: Aman Gupta <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit cd86c5dbcca5e79c979a6a04da25155ccf17f843)
* avformat/mov: Only set pkt->duration to non negative valuesMichael Niedermayer2018-06-151-1/+3
| | | | | | | Reviewed-by: Sasi Inguva <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 8176799f31b23849382623f0f9001acc5edf7c76) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/movenc: fix recognization of cover image streamsTimo Teräs2018-06-151-18/+18
| | | | | | | | | | | | For chapter images, the mov demux produces streams with disposition set to attached_pic+timed_thumbnails. This patch fixes to properly recognize streams that should be encoded as cover image (ones with only and only attached_pic disposition set). Signed-off-by: Timo Teräs <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 2223811b015926fec68473a08016d40cea0989b2) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/movenc: properly handle cover image codecsTimo Teräs2018-06-151-18/+12
| | | | | | | | | | | | | Find codec tag for attached images using appropriate list of supported image formats. This fixes writing the cover image to m4v/m4a and other container formats that do not allow these codecs as a track. Signed-off-by: Timo Teräs <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 12205d2c896b7edbc929d4886e7bfda4b53538e5) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/mov: replace a value error by clipping into valid range in ↵Michael Niedermayer2018-06-151-3/+11
| | | | | | | | | | mov_read_stsc() Fixes: #7165 Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit fe84f70819d6f5aab3c4823290e0d32b99d6de78) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/bintext: Reduce detection for random .bin files as it more likely ↵Michael Niedermayer2018-06-151-1/+1
| | | | | | | | is not a multimedia related file Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 919e37377a76f63d030d680fcb9506a3f8cc2d62) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/mov: Break out early if chunk_count is 0 in mov_build_index()Michael Niedermayer2018-06-151-0/+3
| | | | | | | | | | | Without this some operations might overflow (undefined behavior) even though the index adding loop would never execute No testcase known Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 56e76bd0579cc7f7b28860885d9e569a39daf41b) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/mov: Only fail for STCO/STSC contradictions if both existMichael Niedermayer2018-06-151-1/+1
| | | | | | | | | | Fixes regression with playback of GF9720Repeal20the20Eighth20with20Helen20Linehan.m4a See: crbug 822666 Found-by: "Mattias Wadman <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 2c2d689c56646cce64d02a3b75f61c12c5589260) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/m4vdec: Use the same constant names as libavcodecMichael Niedermayer2018-06-151-4/+7
| | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 0f176bb8e0896f233b35054530f76c4a778b968f) Signed-off-by: Michael Niedermayer <[email protected]>
* avformat/m4vdec: Fix detection of raw MPEG-4 ES StudioMichael Niedermayer2018-06-151-0/+11
| | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 34dbdcfc20d69b7b67fd13112445cd05b9b5d979) Signed-off-by: Michael Niedermayer <[email protected]>
* lavf/libssh: translate a read of 0 to EOFJan Ekström2018-05-281-1/+1
| | | | | | | | | | | | | | Yet another case of forgotten 0 =! EOF translation. While the documentation for this specific synchronous read function does not mention it, the documentation for `sftp_async_read` documents it, as well as looking at the implementation of this function leads one to find `if (handle->eof) { return 0; }`. Reported by stnutt on IRC. (cherry picked from commit 26892c7615395f331f6143535f03a2957973e2e0)
* avformat/mpegts: fix incorrect indentationAman Gupta2018-05-181-3/+3
| | | | | Signed-off-by: Aman Gupta <[email protected]> (cherry picked from commit 64bf915cd851ab604cb87cd463725fd1c6460a1c)
* avformat/mpegts: initialize section_buf to fix valgrind test failureAman Gupta2018-05-181-1/+1
| | | | | | | http://fate.ffmpeg.org/report.cgi?slot=x86_64-archlinux-gcc-valgrind&time=20180513001958 Signed-off-by: Aman Gupta <[email protected]> (cherry picked from commit 42a03e77000692ad6de032b8cf684e1d6ec73790)
* avformat/mpegts: reindent after last changeAman Gupta2018-05-181-35/+35
| | | | | Signed-off-by: Aman Gupta <[email protected]> (cherry picked from commit 7db022e67bab568a560c8bd55f5840e71a34dc15)
* avformat/mpegts: parse sections with multiple tablesAman Gupta2018-05-181-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes PMT parsing in some mpegts streams which contain multiple tables within the PMT pid. Previously, the parser assumed only one table was present in each packet, and discarded the rest of the section data after attempting to parse the first table. A similar issue was documented in the BeyondTV software[1], which helped me diagnose the same bug in the ffmpeg mpegts demuxer. I also tried DVBInspector, libdvbpsi's dvbinfo, and tstools' tsinfo to help debug. The former two properly read PMTs with multiple tables, whereas the last has the same bug as ffmpeg. I've created a minimal sample[2] which contains the combined PMT. Here's what ffmpeg probe shows before and after this patch: Before: Input #0, mpegts, from 'combined-pmt-tids.ts': Duration: 00:00:01.08, start: 4932.966167, bitrate: 741 kb/s Program 1 No Program Stream #0:0[0xf9d]: Audio: ac3, 48000 Hz, mono, fltp, 96 kb/s Stream #0:1[0xf9b]: Audio: mp3, 0 channels, fltp Stream #0:2[0xf9c]: Unknown: none After: Input #0, mpegts, from 'combined-pmt-tids.ts': Duration: 00:00:01.11, start: 4932.966167, bitrate: 718 kb/s Program 1 Stream #0:0[0xf9b]: Video: mpeg2video ([2][0][0][0] / 0x0002), none(tv, top first), 29.97 fps, 29.97 tbr, 90k tbn, 90k tbc Stream #0:1[0xf9c](eng): Audio: ac3 (AC-3 / 0x332D4341), 48000 Hz, 5.1(side), fltp, 384 kb/s Stream #0:2[0xf9d](spa): Audio: ac3 (AC-3 / 0x332D4341), 48000 Hz, mono, fltp, 96 kb/s With the patch, the PMT is parsed correctly so the streams are created in the correct order, are associated with "Program 1", and their codecs are set correctly. [1] http://forums.snapstream.com/vb/showpost.php?p=343816&postcount=201 [2] https://s3.amazonaws.com/tmm1/combined-pmt-tids.ts Signed-off-by: Aman Gupta <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 9152c1e495551535886cfd7a8d7c0a206691443e)
* avformat/mpegts: clean up whitespaceAman Gupta2018-05-181-2/+2
| | | | | Signed-off-by: Aman Gupta <[email protected]> (cherry picked from commit 07d9c31055e6e07629506246d68d93b84bec1507)
* avformat/mpegts: use MAX_SECTION_SIZE instead of hardcoded valueAman Gupta2018-05-181-2/+2
| | | | | Signed-off-by: Aman Gupta <[email protected]> (cherry picked from commit 1a14e39145816597b97db46dbb30e37feddf246c)
* avformat/mpegts: skip non-PMT tids earlierAman Gupta2018-05-181-2/+2
| | | | | | | | | | | | | | | | This mimics the logic flow in all the other callbacks (pat_cb, sdt_cb, m4sl_cb), and avoids calling skip_identical() for non PMT_TID packets. Since skip_identical modifies internal state like MpegTSSectionFilter.last_ver, this change prevents unnecessary reprocessing on some streams which contain multiple tables in the PMT pid. This can be observed with streams from certain US cable providers, which include both tid=0x2 and another unspecified tid=0xc0. Signed-off-by: Aman Gupta <[email protected]> (cherry picked from commit 2c500f50972c19f25ebca783ba9374d6a0c23efb)
* avformat/webm_chunk: always use a static buffer for get_chunk_filenameMarton Balint2018-05-151-1/+7
| | | | | | | | | | | My conversation from AVFormatContext->filename to AVFormatContext->url was wrong in this case because get_chunk_filename uses filename as an output buffer, and not as an input buffer. Fixes ticket #7188. Signed-off-by: Marton Balint <[email protected]> (cherry picked from commit 2dbe936bf7f9e0fe7e8f05e5c3b78fb1afbff164)
* lavf/bluray: translate a read of 0 to EOFJan Ekström2018-05-101-1/+1
| | | | | | | | | Yet another case of forgotten 0 =! EOF translation. The libbluray documentation specifically mentions that a read of 0 is EOF. Reported by Fyr on IRC. (cherry picked from commit b995ec078f42bac95eda18fbd1b4387477b55d0d)
* lavf/dashenc: don't call flush_init_segment before avformat_write_headerRodger Combs2018-05-041-7/+6
| | | | Fixes crash when muxing MKV-in-DASH
* avformat/qtpalette: parse color table according to the QuickTime file format ↵Marton Balint2018-05-011-6/+6
| | | | | | | | | | | | specs The specs says that the the first color component in the color array is not alpha, but simply 0. Fixes 0 alpha of fate-suite/cvid/catfight-cvid-pal8-partial.mov Signed-off-by: Marton Balint <[email protected]> (cherry picked from commit c60a824ee87ae3b15ed1cb92b780bec9b642b019)
* avformat/segafilm - revert keyframe detectionGyan Doshi2018-04-221-1/+1
| | | | | | | | | | | | | | Keyframe detection was inverted in cfe1a9d311 in order to fix keyframe flags set for the sample attached to trac #7091. However, that sample is errantly muxed. As noted at https://web.archive.org/web/20020803104640/http://www.pcisys.net:80/~melanson/codecs/film-format.txt, the original keyframe detection logic is correct, and this patch restores it. Signed-off-by: James Almer <[email protected]> (cherry picked from commit 9f9f56e6791f6c44ac8e4b97a8da5816ed542332)
* avformat/utils: refactor upstream_stream_timingsAman Gupta2018-04-201-11/+10
| | | | | | Signed-off-by: Aman Gupta <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 7b8daa771cbdafa6775e476c65afa659cc1afaac)