summaryrefslogtreecommitdiff
path: root/libavformat/mpegtsenc.c
Commit message (Collapse)AuthorAge
* 10l, commit that should have been stashed into the merge.Michael Niedermayer2011-04-17
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote branch 'qatar/master'Michael Niedermayer2011-04-17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ac3dec: fix processing of delta bit allocation information. vc1: fix fate-vc1 after previous commit. wmv3dec: fix playback of complex WMV3 files using simple_idct. make av_dup_packet() more cautious on allocation failures make containers pass palette change in AVPacket introduce side information for AVPacket Politic commits that have not been pulled: Update regtest checksums after revision 6001dad. Replace more FFmpeg references by Libav. Replace references to ffmpeg-devel with libav-devel; fix roundup URL. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace more FFmpeg references by Libav.Diego Biurrun2011-04-17
| |
* | Merge commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864'Michael Niedermayer2011-04-15
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864': avutil: make aes and sha api public handle malloc failures in ff_get_wav_header add xWMA demuxer mpegts: force the default timebase libavcodec: Bump micro after adding the dtx AVOptions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: force the default timebaseRudolf Polzer2011-04-14
| | | | | | | | | | | | | | The mpegts muxer does not set the stream time base using av_set_pts_info, but expects it to have the default value of 1/90000. If the calling code changes stream pts before writing the header, other muxers override the time base at that point (like mpegenc.c).
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* avio: rename put_flush_packet -> avio_flushAnton Khirnov2011-03-16
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* mpegtsenc: handle multiple language tags per streamAnssi Hannula2011-03-07
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avio: add avio_tell macro as a replacement for url_ftellAnton Khirnov2011-03-04
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* mpegtsenc: use correct PES stream_id for AACTony Strauss2011-02-21
| | | | | | | This adds the AAC codec to the list of audio codecs that results in a PES stream_id of 0xc0 (audio stream). Signed-off-by: Mans Rullgard <mans@mansr.com>
* avio: avio: avio_ prefixes for put_* functionsAnton Khirnov2011-02-21
| | | | | | | | | | | | In the name of consistency: put_byte -> avio_w8 put_<type> -> avio_w<type> put_buffer -> avio_write put_nbyte will be made private put_tag will be merged with avio_put_str Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* avio: rename ByteIOContext to AVIOContext.Anton Khirnov2011-02-20
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* mpegtsenc: whitespace cosmeticsMans Rullgard2011-02-14
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* mpegtsenc: set audio_type according to st->dispositionAnssi Hannula2011-02-14
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* mpegtsenc: fix PMT PID calculationMans Rullgard2011-01-31
| | | | | | | 445996aa51f4f1d9a26456a8511988291a720ba0 caused the PMT PID to be off by one. This corrects it. Signed-off-by: Mans Rullgard <mans@mansr.com>
* Replace defines in libavformat/mpegtsenc.c with AVOptionsGeorgi Chorbadzhiyski2011-01-31
| | | | | | | | | | | | | | | | | | | | | | | Around 01/28/11 18:56, Ronald S. Bultje scribbled: > That patch is now merged, can you submit the update to muxers.texi? > Then we'll apply the whole thing. See attached. I hope the documentation is enough. -- Georgi Chorbadzhiyski http://georgi.unixsol.org/ From c236024b8254f5c2c45934c30fff390cb0e55a5e Mon Sep 17 00:00:00 2001 From: Georgi Chorbadzhiyski <gf@unixsol.org> Date: Tue, 25 Jan 2011 13:09:17 +0200 Subject: [PATCH] mpegts: Replace defines in with AVOptions This patch adds support for setting transport_stream_id, original_network_id, service_id, pmt_start_pid and start_pid in mpegts muxer. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* mpegtsenc: support CODEC_ID_AAC_LATMPeter Ross2011-01-28
| | | | | | | | | | | | | | | $subject. Have used this for loopback testing with mpegts.c. -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B) [2. text/x-diff; 0001-mpegtsenc-support-CODEC_ID_AAC_LATM.patch] From 0f7f9db4b7da1793996af6dda84298507703759a Mon Sep 17 00:00:00 2001 From: Peter Ross <pross@xvid.org> Date: Sun, 9 Jan 2011 09:45:50 +1100 Subject: [PATCH] mpegtsenc: support CODEC_ID_AAC_LATM Signed-off-by: Mans Rullgard <mans@mansr.com>
* In mpegts "reserved_future_use" field must be set to 1 in SDT tableGeorgi Chorbadzhiyski2011-01-28
| | | | | | | | | | | According to EN 300 468 section 3.1 (Definitions): Unless otherwise specified within the present document all "reserved_future_use" bits is set to "1". This was not the case for SDT generation so this patch fixes it. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-26
| | | | | This also lists the objects from those two libraries as internal (by adding the ff_ prefix) so that they can then be hidden via linker scripts.
* mpegtsenc: set reserved bits to 1 in PCR fieldGeorgi Chorbadzhiyski2011-01-26
| | | | | | | The reserved bits between PCR base and extension fields must be set to 1. Signed-off-by: Mans Rullgard <mans@mansr.com>
* mpegtsenc: remove unused variablesGeorgi Chorbadzhiyski2011-01-25
| | | | | | | | | | | | | Remove two variables that were not used and caused the following warnings: CC libavformat/mpegtsenc.o libavformat/mpegtsenc.c: In function 'mpegts_write_section': libavformat/mpegtsenc.c:72:18: warning: unused variable 'ts' libavformat/mpegtsenc.c: In function 'mpegts_insert_null_packet': libavformat/mpegtsenc.c:586:18: warning: unused variable 'ts' Signed-off-by: Mans Rullgard <mans@mansr.com>
* mpegtsenc: prefer metadata keyed with "service_name"Janne Grunau2011-01-20
| | | | | | title metadata is only used as fallback if no service_name is available. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* Add service_provider and service_name metadataGeorgi Chorbadzhiyski2011-01-20
| | | | | | | | | | | | | | This patch adds support in mpegts muxer for using service_provider and service_name metadata to set service_provider_name and service_name fields in SDT. Example usage: ffmpeg -i file.ts -f mpegts -re -acodec copy -vcodec copy -f mpegts \ -metadata service_provider="Some provider" \ -metadata service_name="Some Channel" \ "udp://239.0.70.2:5000?pkt_size=1316&ttl=1" Signed-off-by: Mans Rullgard <mans@mansr.com>
* mpegtsenc: Improve PCR generation and outputTomas Härdin2010-12-03
| | | | | | | This fixes PCR drift due to accumulating TS_PACKET_SIZE*8*90000LL/ts->mux_rate each packet, due to rounding errors when mux_rate does not evenly divide 135360000. This patch also increases the PCR precision to 27 MHz from 90 kHz and takes the location of the PCR data into account (+11 bytes according to the spec). Originally committed as revision 25864 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mpegtsenc: IndentTomas Härdin2010-09-27
| | | | Originally committed as revision 25222 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mpegtsenc: Write subtitle extradata if setTomas Härdin2010-09-27
| | | | Originally committed as revision 25221 to svn://svn.ffmpeg.org/ffmpeg/trunk
* In mpegts muxer, fix rbsp trailing bits in AUD nal, fixes issue #2122Baptiste Coudurier2010-07-23
| | | | Originally committed as revision 24449 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add av_ prefix to bswap macrosMåns Rullgård2010-07-10
| | | | Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
* In mpegts muxer, print VBR instead of dummy 1 when displaying muxrateBaptiste Coudurier2010-07-08
| | | | Originally committed as revision 24125 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mpegtsenc: allocate correct size for PID tableMåns Rullgård2010-07-01
| | | | Originally committed as revision 23951 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Allow setting streamid when muxing mpegts.Mike Scheutzow2010-06-30
| | | | | | Patch by Mike Scheutzow, scheutzow alcatel-lucent com Originally committed as revision 23918 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move the internal function declarations in avformat.h to internal.h.Stefano Sabatini2010-04-11
| | | | Originally committed as revision 22843 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace all remaining occurrences of AVERROR_NOMEM withStefano Sabatini2010-04-03
| | | | | | | | | AVERROR(ENOMEM). AVERROR_NOMEM is deprecated and will be dropped at the next libavutil major bump. Originally committed as revision 22791 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-30
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* In mpegts muxer, free adts context and temporary dataBaptiste Coudurier2010-03-10
| | | | Originally committed as revision 22428 to svn://svn.ffmpeg.org/ffmpeg/trunk
* reindentBaptiste Coudurier2010-03-10
| | | | Originally committed as revision 22427 to svn://svn.ffmpeg.org/ffmpeg/trunk
* In mpegts muxer, write adts header if aac bitstream does not contain itBaptiste Coudurier2010-03-09
| | | | Originally committed as revision 22355 to svn://svn.ffmpeg.org/ffmpeg/trunk
* In mpegts muxer, search for h264 aud nal, it might not be the first nal.Baptiste Coudurier2010-03-08
| | | | | | | Improve ther error message when bitstream is malformated and tell user to use the bitstream filter. Originally committed as revision 22354 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mpegts vbr muxing, activated when muxing rate is not supplied by theBaptiste Coudurier2010-03-08
| | | | | | user. Originally committed as revision 22352 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Start continuity counter at 0 for pmt as wellBaptiste Coudurier2010-03-08
| | | | Originally committed as revision 22350 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Start continuity counter at 0 for streamsBaptiste Coudurier2010-03-08
| | | | Originally committed as revision 22344 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 10l typo, fix ts total bit rate computationBaptiste Coudurier2010-03-08
| | | | Originally committed as revision 22343 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Correctly increment continuity_counter in PCR packets.Yann Coupin2010-02-24
| | | | | | Patch by Yann Coupin, yann.coupin+ffmpeg gmail Originally committed as revision 22020 to svn://svn.ffmpeg.org/ffmpeg/trunk
* revert wrongly commited hunk in r21205Baptiste Coudurier2010-01-13
| | | | Originally committed as revision 21207 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove useless declarations from mpegts.hBaptiste Coudurier2010-01-13
| | | | Originally committed as revision 21205 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use codec rc_max_rate if set and warn if bit rate is not setBaptiste Coudurier2010-01-13
| | | | Originally committed as revision 21204 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not split audio frames accross pes packets.Baptiste Coudurier2010-01-13
| | | | | | This was not supported by some equipment and cisco analyzer. Originally committed as revision 21203 to svn://svn.ffmpeg.org/ffmpeg/trunk
* print more debug info about muxing parameters, patch by Mike Scheutzow, ↵Mike Scheutzow2010-01-13
| | | | | | scheutzow at alcatel-lucent dot com Originally committed as revision 21201 to svn://svn.ffmpeg.org/ffmpeg/trunk
* update mpegts_write_pes documentation, patch by Mike Scheutzow, scheutzow at ↵Mike Scheutzow2010-01-13
| | | | | | alcatel-lucent dot com Originally committed as revision 21200 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Insert null packets to keep pcr values correct, patch by Mike Scheutzow,Mike Scheutzow2010-01-13
| | | | | | scheutzow at alcatel-lucent dot com and Niobos, niobos at dest-unreach dot be. Originally committed as revision 21199 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-31 09:26:43 +0000