summaryrefslogtreecommitdiff
path: root/libavformat/mpegtsenc.c
Commit message (Collapse)AuthorAge
* Merge commit '28816050e47b6dba430a52e429d21a864cffda8e'Michael Niedermayer2014-10-07
|\ | | | | | | | | | | | | | | | | | | * commit '28816050e47b6dba430a52e429d21a864cffda8e': lavf: Set the stream time base hint properly for chained muxers Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Set the stream time base hint properly for chained muxersMartin Storsjö2014-10-06
| | | | | | | | | | | | | | This avoids warnings about using the codec time base as time base hint. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/mpegtsenc: More verbose warning messages in case of missing video ↵Michael Niedermayer2014-09-16
| | | | | | | | | | | | ES startcodes Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | align and correct messages regarding bitstream filtersMoritz Barsnick2014-08-19
| | | | | | | | | | | | | | The messages regarding the recommended use of bitstream filters are somewhat different. This also adds the ":v" stream specifier to "-bsf h264_mp4toannexb". Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>
* | Merge commit 'e8049af1325dd59a51546c15b2e71a0f578e9d27'Michael Niedermayer2014-08-14
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e8049af1325dd59a51546c15b2e71a0f578e9d27': mpegts: Do not try to write a PMT larger than SECTION_SIZE Conflicts: libavformat/mpegtsenc.c See: 842b6c14bcfc1c5da1a2d288fd65386eb8c158ad Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Do not try to write a PMT larger than SECTION_SIZELuca Barbato2014-08-13
| | | | | | | | | | | | | | | | | | | | | | Prevent out of array writes. Similar to what Michael Niedermayer did to address the same issue. Bug-Id: CVE-2014-2263 CC: libav-stable@libav.org Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Check for hevc startcode when muxing into mpeg-ts.Carl Eugen Hoyos2014-08-12
| |
* | Merge commit '8dca0877e3e1457e9ec79ffa1ead1135aabb791c'Michael Niedermayer2014-08-10
|\| | | | | | | | | | | | | | | | | | | * commit '8dca0877e3e1457e9ec79ffa1ead1135aabb791c': mpegts: Return proper error code on invalid input data Conflicts: libavformat/mpegtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Return proper error code on invalid input dataNidhi Makhijani2014-08-10
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * mpegts: Use av_free() to free memory allocated by av_strdup()Diego Biurrun2014-08-08
| |
* | avformat/mpegtsenc: Use av_freep() for pidsMichael Niedermayer2014-08-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: Free services array completely on failureMichael Niedermayer2014-08-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: Use correct deallocation code on failure of pids array ↵Michael Niedermayer2014-08-07
| | | | | | | | | | | | allocation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegtsenc: Check dynarray_add() for failureMichael Niedermayer2014-08-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: use the correct deallocation functionsMichael Niedermayer2014-08-07
| | | | | | | | | | Found-by: Carl Eugen Hoyos <ce@hoyos.ws> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5b220e1e19c17b202d83d9be0868d152109ae8f0'Michael Niedermayer2014-08-07
|\| | | | | | | | | | | | | | | | | | | * commit '5b220e1e19c17b202d83d9be0868d152109ae8f0': mpegts: Fix memory leaks and related crashes in mpegs_write_header() Conflicts: libavformat/mpegtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Fix memory leaks and related crashes in mpegs_write_header()Diego Biurrun2014-08-07
| |
* | Merge commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc'Michael Niedermayer2014-08-07
|\| | | | | | | | | | | | | * commit 'f8ab9f2fe3730a0e8c3c1eb7c486f7c0041fb3fc': mpegts: Avoid unnecessary variable shadowing Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Avoid unnecessary variable shadowingDiego Biurrun2014-08-07
| |
* | Merge commit '6d6bd3a3db24747ae5e10716f4782129c38951f6'Michael Niedermayer2014-08-07
|\| | | | | | | | | | | | | * commit '6d6bd3a3db24747ae5e10716f4782129c38951f6': mpegts: Drop some unnecessary parentheses Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Drop some unnecessary parenthesesDiego Biurrun2014-08-07
| |
* | Merge commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50'Michael Niedermayer2014-08-07
|\| | | | | | | | | | | | | | | | | | | * commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50': mpegts: K&R formatting cosmetics Conflicts: libavformat/mpegtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: K&R formatting cosmeticsDiego Biurrun2014-08-07
| |
| * mpegts: Add HEVC definitionsFemi Adeyemi-Ejeye2014-08-05
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '89616408e38ac7257e36976723df0e23d6ee1157'Michael Niedermayer2014-08-05
|\| | | | | | | | | | | | | * commit '89616408e38ac7257e36976723df0e23d6ee1157': mpegts: Define the section length with a constant Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Define the section length with a constantLuca Barbato2014-08-04
| | | | | | | | | | The specification says the value is expressed in 10 bits including the 4-byte CRC.
* | avformat/mpegtsenc: do not flush after everythingMichael Niedermayer2014-08-03
| | | | | | | | | | | | | | | | | | there is flushing code in the avformat core that does this in a more controlled way. Fixes ticket2748 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '194be1f43ea391eb986732707435176e579265aa'Michael Niedermayer2014-06-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '194be1f43ea391eb986732707435176e579265aa': lavf: switch to AVStream.time_base as the hint for the muxer timebase Conflicts: doc/APIchanges libavformat/filmstripenc.c libavformat/movenc.c libavformat/mxfenc.c libavformat/oggenc.c libavformat/swf.h libavformat/version.h tests/ref/lavf/mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: switch to AVStream.time_base as the hint for the muxer timebaseAnton Khirnov2014-06-18
| | | | | | | | | | | | | | | | | | | | | | | | Previously, AVStream.codec.time_base was used for that purpose, which was quite confusing for the callers. This change also opens the path for removing AVStream.codec. The change in the lavf-mkv test is due to the native timebase (1/1000) being used instead of the default one (1/90000), so the packets are now sent to the crc muxer in the same order in which they are demuxed (previously some of them got reordered because of inexact timestamp conversion).
* | Merge commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd'Michael Niedermayer2014-06-10
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd': mpegts: Provide an option to override the pcr period Conflicts: doc/muxers.texi libavformat/mpegtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Provide an option to override the pcr periodLuca Barbato2014-06-10
| | | | | | | | Certain hardware demuxer have specific restrictions for PCR periodicity.
* | Merge commit '3f7e94eccd1c0d64679f2c4eda8bb942a158dfac'Michael Niedermayer2014-06-10
|\| | | | | | | | | | | | | | | | | | | * commit '3f7e94eccd1c0d64679f2c4eda8bb942a158dfac': mpegts: Move the option section to the bottom Conflicts: libavformat/mpegtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Move the option section to the bottomLuca Barbato2014-06-10
| | | | | | | | | | Makes it consistent with the rest of the formats and ease usage of macros constants for the defaults.
* | Fix the mime types for MPEG and MPEG-TS formatsFlorent Le Coz2014-05-22
| | | | | | | | | | | | As per the RFCs: http://tools.ietf.org/html/rfc3555#page-38 http://tools.ietf.org/html/rfc3003
* | avformat/mpegtsenc: fix dts for chained muxing aac in mpegtsMichael Niedermayer2014-05-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: fix minor typo in omit_video_pes_length descriptionAman Gupta2014-05-11
| | | | | | | | | | Signed-off-by: Aman Gupta <ffmpeg@tmm1.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: Allow DTS audio copy to TS streamsgoodthanks2014-04-27
| | | | | | | | | | | | | | | | | | This doesn't allow encoding of DTS or TrueHD. It just sets the correct stream ID in the TS output file when a DTS or TrueHD audio stream is copied. Fixes ticket #1398 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: check avformat_new_stream() returnMichael Niedermayer2014-04-26
| | | | | | | | | | Fixes CID1206645 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add missing ';'.Reimar Döffinger2014-04-22
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | avformat/mpegtsenc: make the pes packet length omission optionalMichael Niedermayer2014-04-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: Changed Video PES packet length to 0.Graham Booker2014-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rational for this is another issue that plex has exposed. When it is conducting a transcode of video to HLS for streaming, my father noticed artifacts when played on his GoogleTV (NSZ-GT1). He sent me a test file and I reproduced it on my device of the same model. It is important to note that the artifacts were not present when streaming to VLC or QuickTime Player. I copied the command-line that plex used, and conducted all of the following tests using FFmpeg git. Transcode to HLS: artifacts on playback Transcode to TS: playback is fine Cat HLS segments into a single TS: playback is fine Segment single TS file to segments: artifacts on playback Segment single TS file to segments using Apple's HLS segmenter: playback is fine At this point I carefully examined the differences between Apple's HLS segmenter output and FFmpeg's. Among the considerable differences, I noticed that the video PES packets always had a 0 length. So I continued: Transcode to HLS using FFmpeg with 0 length PES packets: playback is fine. Segment single TS to segments with 0 length PES packets: playback is fine. All failures mentioned are only on the GTV since it is the only player on which I could reproduce artifacts. I only tested the GTV, VLC, and QuickTime Player though, so my test case is limited. I do not know if other players exhibit this issue. Since it was useful last time, I have uploaded the test file as hls_pes_packet_length.m4v along with its associated txt file which contains the transcode command-line that was used. Reviewed-by: Kieran Kunhya <kierank@obe.tv> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: use av_malloc_array()Michael Niedermayer2014-04-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: move startcode validity check to ff_check_h264_startcodePeter Ross2014-03-30
| | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: fix HEVC MPEG TS stream typeolugbone2014-03-04
| | | | | | | | | | | | Allowing HEVC video using TS stream type 0x24 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: Check data array size in mpegts_write_pmt()Michael Niedermayer2014-02-13
| | | | | | | | | | | | Prevents out of array writes Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts muxer: DVB subtitles multiple languages supportmrlika2014-02-13
| | | | | | | | | | | | | | | | * restore multiple languages data from extradata to PMT table * setting correctly hearing empaired subtitling type Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts muxer: restore PMT table of DVB teletext from extradataSerhii Marchuk2014-01-24
| | | | | | | | | | | | | | | | | | * Using extradata by TS muxer to correctly restore PMT table * PES_header_data_length should be always 0x24 for DVB teletext, according to DVB standard Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts muxer: Change the default subtitle language to "und"Serhii Marchuk2014-01-24
| | | | | | | | | | Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mpegtsenc: fix weird indentStefano Sabatini2014-01-21
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 10:33:12 +0000