summaryrefslogtreecommitdiff
path: root/libavformat/mpegtsenc.c
Commit message (Collapse)AuthorAge
* Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer2015-04-20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a3eb042c704dea190c644def5b32c9cee8832b8': Replace av_dlog with normal av_log at trace level Conflicts: ffplay.c libavdevice/fbdev_dec.c libavfilter/avfilter.c libavfilter/internal.h libavfilter/setpts.c libavfilter/src_movie.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_fieldorder.c libavformat/assdec.c libavformat/avidec.c libavformat/flvdec.c libavformat/http.c libavformat/ipmovie.c libavformat/isom.c libavformat/mov.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/mpegtsenc.c libavformat/mux.c libavformat/mxfdec.c libavformat/nsvdec.c libavformat/oggdec.c libavformat/r3d.c libavformat/rtspdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace av_dlog with normal av_log at trace levelVittorio Giovara2015-04-19
| | | | | | | | This applies to every library where performance is not critical.
* | lavf/mpegtsenc: Accept 0x000001 as startcode for hevc.Carl Eugen Hoyos2015-04-14
| | | | | | | | Fixes ticket #4194.
* | Merge commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0'Michael Niedermayer2015-04-03
|\| | | | | | | | | | | | | | | | | | | * commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0': mpegtsenc: Take max_delay into account when buffering multiple audio packets into one PES packet Conflicts: libavformat/mpegtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegtsenc: Take max_delay into account when buffering multiple audio packets ↵Martin Storsjö2015-04-03
| | | | | | | | | | | | | | | | | | | | into one PES packet Make sure we don't buffer up more than max_delay worth of data before writing a PES packet, even if pes_payload_size is set to a larger value. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Allow muxing h264 into ts with startcode "001" instead of "0001".Carl Eugen Hoyos2015-02-25
| | | | | | | | | | Fixes ticket #2220. Fixes ticket #4324.
* | Merge commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a'Michael Niedermayer2015-02-25
|\| | | | | | | | | | | | | * commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a': libavformat: Use ffio_free_dyn_buf where applicable Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavformat: Use ffio_free_dyn_buf where applicableMartin Storsjö2015-02-24
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/mpegtsenc: Do not create invalid files from annex b streams without ↵Michael Niedermayer2015-02-12
| | | | | | | | | | | | | | | | | | | | SPS/PPS use global headers to create SPS/PPS when they are available Fixes Ticket4248 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: Fix build with msvcMatt Oliver2015-02-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "avformat/mpegtsenc: Change the service_type field to enum"Michael Niedermayer2015-02-02
| | | | | | | | | | | | | | This isnt safe due to AVOption accessing this field as int i just realized a moment after pushing This reverts commit 0935453e84a17035f0c3544913e7ab7775839176.
* | avformat/mpegtsenc: Change the service_type field to enumMichael Niedermayer2015-02-02
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/mpegtsenc: allow to set service_type in sdtdhead6662015-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an option to set the service type in mpegts as defined in ETSI 300 468. I added what I believe are the most useful service types as pre defined values, the others can be sent by using their hexdecimal form directly (e.g. -mpegts_service_type digital_radio, -mpegts_service_type 0x07). I've been using this patch in order to pipe internet radio stream (originally as HLS/m3u8) from ffmpeg to tvheadend, when the service type set right tvheadend recognize the mpegts stream as a radio channel. The patch in its original form was written by linuxstb from freenode's hts channel which allowed me pushing it upstream. This close issue 4118. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: Use av_freep() to avoid leaving stale pointers in memoryMichael Niedermayer2014-12-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa'Michael Niedermayer2014-12-20
|\| | | | | | | | | | | | | * commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa': mpegts: Support running the write_trailer function without an AVIOContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Support running the write_trailer function without an AVIOContextMartin Storsjö2014-12-19
| | | | | | | | | | | | | | | | If opening and closing dynamic buffers as AVIOContext, we may not have any AVIOContext available when wanting to close and deallocate the muxer. Allow calling write_trailer despite this. Signed-off-by: Martin Storsjö <martin@martin.st>
| * Drop the unofficial extension prefix for MPEG and MPEG-TS formatsFlorent Le Coz2014-12-02
| | | | | | | | | | | | | | | | As per the RFCs: http://tools.ietf.org/html/rfc3555#page-38 http://tools.ietf.org/html/rfc3003 CC: libav-stable@libav.org
| * mpegtsenc: recognize .mts as MPEG Transport StreamJean-Baptiste Mardelle2014-12-02
| |
* | Merge commit '8f8caca2242e1fe05f37493cfabcd3f4de198550'Michael Niedermayer2014-12-02
|\| | | | | | | | | | | | | | | | | | | | | * commit '8f8caca2242e1fe05f37493cfabcd3f4de198550': Add support for BDAV/m2ts-mode muxing Conflicts: libavformat/mpegtsenc.c See: 09a858da7d5535e78e9cf942a468aec411ffbf19 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add support for BDAV/m2ts-mode muxingFredrik Axelsson2014-12-02
| | | | | | | | | | Signed-off-by: Fredrik Axelsson <fraxbe@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: change the min value for mpegts_start_pid to allow ATSC PIDsdedicatedbroadcastsolutions2014-11-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-16 13:49:22 +0000