summaryrefslogtreecommitdiff
path: root/libavformat/mpegts.c
Commit message (Collapse)AuthorAge
* avformat/mpegts: use a padded buffer in read_sl_header()Michael Niedermayer2014-10-04
| | | | | | | | Fixes overread Fixes: asan_heap-oob_84f75d_8_asan_heap-oob_a2a00a_341_mbc.ts Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mpegts: Check desc_len / get8() return codeMichael Niedermayer2014-10-04
| | | | | | | | Fixes out of array read Fixes: signal_sigsegv_844d59_10_signal_sigsegv_a17bb7_366_mpegts_mpeg2video_mp2_dvbsub_topfield.rec Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mpegts: Improve probe heuristic by considering the overall ↵Michael Niedermayer2014-09-13
| | | | | | | | frequency of 0x47 headers Fixes Ticket3939 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mpegts: fix spelling errorAndreas Cadhalpun2014-09-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mpegts: Change order of structs to match ↵Michael Niedermayer2014-09-03
| | | | | | 7968059e5c3cd8f91407f379c11bbf71a1b84c74 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74'Michael Niedermayer2014-09-03
|\ | | | | | | | | | | | | | | | | | | * commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74': mpegts: Allow custom max resync size Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Allow custom max resync sizeLuca Barbato2014-09-03
| |
* | avformat/mpegts: favor DESC_types over probed codecsMichael Niedermayer2014-09-01
| | | | | | | | | | | | | | Fixes Ticket3766 Fixes dvb_teletext detection Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Use differential score for analyze()Michael Niedermayer2014-08-16
| | | | | | | | | | | | | | | | This avoids high scores in random data that has a high 0x47 frequency Fixes Ticket3844 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: always parse pcrMarton Balint2014-08-16
| | | | | | | | | | | | | | Previously pcr transmitted without payload but as part of the video stream was not parsed. Signed-off-by: Marton Balint <cus@passwd.hu>
* | Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume2014-08-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | lavf/mpegts: remove obsolete ff_mpegts_parse_* cruftJames Almer2014-08-11
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | replace calls to url_feof() with avio_feof()James Almer2014-08-08
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mpegts: Do not return the result of a (void) function from a void function.Carl Eugen Hoyos2014-08-07
| | | | | | | | Fixes compilation with Sun C 5.10.
* | lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()James Almer2014-08-07
| | | | | | | | | | | | | | The were wrongly being exported and used by libavdevice Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add int64_t probesize2 instead of int probesize to AVFormatContext.Carl Eugen Hoyos2014-07-30
| | | | | | | | | | Allows to set a probesize >2G. Tested-by: Oliver Fromme
* | Merge commit 'fc27e7272e6f1a7053812f8a15b1b7098de44c71'Michael Niedermayer2014-07-22
|\| | | | | | | | | | | | | * commit 'fc27e7272e6f1a7053812f8a15b1b7098de44c71': mpegts: do not export empty language tags Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: do not export empty language tagsJan Gerber2014-07-21
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * mpegts: pass MpegTSContext ptr explicitlyAlexander V. Lukyanov2014-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | AVFormatContext->priv_data is not always a MpegTSContext, it can be RTSPState when decoding a RTP stream. So it is necessary to pass MpegTSContext pointer explicitly. Within libav, the write_section_data function doesn't actually use the MpegTSContext at all, so this doesn't change anything at the moment (no memory was corrupted before), but it reduces the risk of anybody trying to touch the MpegTSContext via AVFormatContext->priv_data in the future. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/mpegts: dont clear programs during probingMichael Niedermayer2014-07-12
| | | | | | | | | | | | Fixes Ticket 3763 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: skip updating programs/streams when determining durationMichael Niedermayer2014-07-11
| | | | | | | | | | | | Fixes Ticket2441 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: pass MpegTSContext ptr explicitly (fixes #3721)Alexander V. Lukyanov2014-07-08
| | | | | | | | | | | | | | | | | | | | | | | | | | AVFormatContext->priv_data is not always a MpegTSContext, it can be RTSPState when decoding a RTP stream. So it is necessary to pass MpegTSContext pointer explicitly. This fixes memory corruption from bug #3721 (RTSPState is smaller than MpegTSContext thus innocent memory gets overwritten). Signed-off-by: Alexander V. Lukyanov <lavv17f@gmail.com> Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mpegts: Reduce number of "Predefined SLConfigDescriptor" warnings shown.Carl Eugen Hoyos2014-06-09
| |
* | mpegts: always reset pes packet state on new packetMarton Balint2014-05-05
| | | | | | | | | | | | Fixes ticket #3584. Signed-off-by: Marton Balint <cus@passwd.hu>
* | mpegts: unref buffer in reset_pes_packet_stateMarton Balint2014-05-05
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | mpegts: factorize pes packet state reset functionMarton Balint2014-05-05
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | mpegts: fix indentation after last commitMarton Balint2014-05-05
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | mpegts: only emit new packets if data buffer existsMarton Balint2014-05-05
| | | | | | | | | | | | | | | | | | I don't think this can acutally happen in the current code, but better safe than sorry. Fixes Coverity CID 732217. Signed-off-by: Marton Balint <cus@passwd.hu>
* | mpegts: remove uneeded buf_size checkMarton Balint2014-05-05
| | | | | | | | | | | | It is already ensured by the loop condition Signed-off-by: Marton Balint <cus@passwd.hu>
* | avformat/mpegts: Remove redundant checkMichael Niedermayer2014-04-16
| | | | | | | | | | | | Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: fix teletext pts of streams with standalone pcr pidMarton Balint2014-03-22
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | mpegts: add pcr filter for tracking standalone pcr pidsMarton Balint2014-03-22
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | mpegts: factorize mpegts filter creator codeMarton Balint2014-03-22
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | mpegts: move last_pcr to MpegTSFilter levelMarton Balint2014-03-22
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | Merge commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065'Michael Niedermayer2014-03-18
|\| | | | | | | | | | | | | | | | | | | * commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065': mpegts: Forward error codes in various functions Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Forward error codes in various functionsKeiji Costantini2014-03-18
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a'Michael Niedermayer2014-03-18
|\| | | | | | | | | | | | | | | | | | | * commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a': mpegts: K&R formatting cosmetics Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: K&R formatting cosmeticsKeiji Costantini2014-03-18
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | mpegts: use goto out instead of break on truncated or invalid pmt tablesMarton Balint2014-03-05
| | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5397386effba2e53e4ff82852a86f6be4d59e9c1'Michael Niedermayer2014-03-04
|\| | | | | | | | | | | | | * commit '5397386effba2e53e4ff82852a86f6be4d59e9c1': mathops: move macro to the only place it is used Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mathops: move macro to the only place it is usedVittorio Giovara2014-03-04
| | | | | | | | This helps in disentangling lavf and lavc too.
* | Revert "mpegts: do not set pts for missing dts in video streams"Michael Niedermayer2014-03-02
| | | | | | | | | | | | | | | | | | This reverts commit f65afef1df49f53e14c8d4173ff960fff8d44ecb. If only pts is coded then dts must be equal pts See Rec. ITU-T H.222.0 (06/2012) / ISO/IEC 13818-1:2013 (E) 2.7.5 Found-by: Baptiste Coudurier
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-20
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: libavformat/mpegts: expose raw packet size Conflicts: libavformat/mpegts.c See: f9b997c337873dad99f7fd505588b260febaf32b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavformat/mpegts: expose raw packet sizeLeandro Dorileo2014-02-19
| | | | | | | | | | | | | | | | We cannot easily determine if an mpeg TS's packet size is DVHS, FEC or so on, for that we need to expose the internal raw_packet_size field. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * mpegts: add HEVC registration descriptorCarl Eugen Hoyos2013-12-12
| |
| * mpegts: Support HEVC demuxingMickaël Raulet2013-10-31
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avformat/mpegts: DVB subtitles multiple languages supportmrlika2014-02-14
| | | | | | | | | | | | | | | | Copy multiple languages data from PMT to extradata. New 5 bytes per language extradata format. Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Continue parsing PMTs until at least 2 streams are found or ↵Michael Niedermayer2014-01-29
| | | | | | | | | | | | | | | | | | | | 100kb are reached This (ugly) hack fixes Ticket3348 If someone has an idea on how to fix this nicer, that would be very welcome but the stream contains several PMTs with just one of the 2 streams at the start Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: drop stray spaceMichael Niedermayer2014-01-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>