aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mpegts.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | avformat/mpegts: fix Opus stream countRafaël Carré2014-12-051-2/+1
| | | | | | | | | | | | That number represents the number of streams, not the number of channels Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: improve first valid PMT heuristicMichael Niedermayer2014-11-081-1/+6
| | | | | | | | | | | | | | This checks for audio+video instead of streams > 2 Fixes Ticket4090 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: add scan_all_pmts optionMichael Niedermayer2014-11-081-1/+7
| | | | | | | | | | | | | | | | | | | | This allows selecting if the demuxer should consider all streams to be found after the first PMT and add further streams during decoding or if it rather should scan all that are within the analyze-duration and other limits Fixes Ticket3762 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: fix iteration count in add_pid_to_pmt()Michael Niedermayer2014-11-041-1/+1
| | | | | | | | | | | | Fixes accessing uninitialized memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: also print PMT version in av_dlog()Michael Niedermayer2014-11-041-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Continue parsing PMTs during duration estimationMichael Niedermayer2014-11-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | This way if we by chance run into a valid PMT we have a more complete set of streams, also do not reset streams in case we run into a worse PMT Fixes Ticket4046 alternatively Ticket4046 could be closed as invalid or wontfix as it contains some PMTs which lack the 2 subtitle streams Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Do not add pid if its already there with add_pid_to_pmt()Michael Niedermayer2014-11-031-0/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Add support for Opus in MPEG-TSKieran Kunhya2014-10-261-1/+53
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: add the judgement if a new program is created successfullyDi Wu2014-10-161-2/+4
| | | | | | | | | | | | | | | | Add the judement after create a new program to avoid segment fault. Signed-off-by: Di Wu <di1028.wu@samsung.com> Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: use a padded buffer in read_sl_header()Michael Niedermayer2014-10-041-1/+5
| | | | | | | | | | | | | | | | 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-041-1/+1
| | | | | | | | | | | | | | | | 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-131-4/+3
| | | | | | | | | | | | | | | | frequency of 0x47 headers Fixes Ticket3939 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: fix spelling errorAndreas Cadhalpun2014-09-061-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Change order of structs to match ↵Michael Niedermayer2014-09-031-19/+19
| | | | | | | | | | | | 7968059e5c3cd8f91407f379c11bbf71a1b84c74 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74'Michael Niedermayer2014-09-031-5/+13
|\| | | | | | | | | | | | | | | | | | | * 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-031-2/+22
| |
* | avformat/mpegts: favor DESC_types over probed codecsMichael Niedermayer2014-09-011-1/+1
| | | | | | | | | | | | | | Fixes Ticket3766 Fixes dvb_teletext detection Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Use differential score for analyze()Michael Niedermayer2014-08-161-1/+4
| | | | | | | | | | | | | | | | 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-161-7/+5
| | | | | | | | | | | | | | 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-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-151-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | lavf/mpegts: remove obsolete ff_mpegts_parse_* cruftJames Almer2014-08-111-18/+0
| | | | | | | | | | 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-081-1/+1
| | | | | | | | | | 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-071-1/+1
| | | | | | | | Fixes compilation with Sun C 5.10.
* | lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()James Almer2014-08-071-4/+22
| | | | | | | | | | | | | | 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-301-5/+6
| | | | | | | | | | Allows to set a probesize >2G. Tested-by: Oliver Fromme
* | Merge commit 'fc27e7272e6f1a7053812f8a15b1b7098de44c71'Michael Niedermayer2014-07-221-1/+1
|\| | | | | | | | | | | | | * 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-211-1/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * mpegts: pass MpegTSContext ptr explicitlyAlexander V. Lukyanov2014-07-101-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-121-1/+4
| | | | | | | | | | | | Fixes Ticket 3763 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: skip updating programs/streams when determining durationMichael Niedermayer2014-07-111-0/+14
| | | | | | | | | | | | Fixes Ticket2441 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: pass MpegTSContext ptr explicitly (fixes #3721)Alexander V. Lukyanov2014-07-081-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-091-1/+3
| |
* | mpegts: always reset pes packet state on new packetMarton Balint2014-05-051-1/+2
| | | | | | | | | | | | Fixes ticket #3584. Signed-off-by: Marton Balint <cus@passwd.hu>
* | mpegts: unref buffer in reset_pes_packet_stateMarton Balint2014-05-051-1/+2
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | mpegts: factorize pes packet state reset functionMarton Balint2014-05-051-6/+10
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | mpegts: fix indentation after last commitMarton Balint2014-05-051-10/+10
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | mpegts: only emit new packets if data buffer existsMarton Balint2014-05-051-2/+2
| | | | | | | | | | | | | | | | | | 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-051-1/+1
| | | | | | | | | | | | It is already ensured by the loop condition Signed-off-by: Marton Balint <cus@passwd.hu>
* | avformat/mpegts: Remove redundant checkMichael Niedermayer2014-04-161-1/+1
| | | | | | | | | | | | 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-221-5/+17
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | mpegts: add pcr filter for tracking standalone pcr pidsMarton Balint2014-03-221-5/+16
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | mpegts: factorize mpegts filter creator codeMarton Balint2014-03-221-17/+18
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | mpegts: move last_pcr to MpegTSFilter levelMarton Balint2014-03-221-13/+9
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | Merge commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065'Michael Niedermayer2014-03-181-42/+48
|\| | | | | | | | | | | | | | | | | | | * 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-181-48/+61
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a'Michael Niedermayer2014-03-181-348/+399
|\| | | | | | | | | | | | | | | | | | | * 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-181-329/+391
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | mpegts: use goto out instead of break on truncated or invalid pmt tablesMarton Balint2014-03-051-4/+4
| | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5397386effba2e53e4ff82852a86f6be4d59e9c1'Michael Niedermayer2014-03-041-1/+7
|\| | | | | | | | | | | | | * commit '5397386effba2e53e4ff82852a86f6be4d59e9c1': mathops: move macro to the only place it is used Merged-by: Michael Niedermayer <michaelni@gmx.at>