summaryrefslogtreecommitdiff
path: root/libavformat/mpegts.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-061-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: yuv4mpeg: return proper error codes. Give all anonymously typedeffed structs in headers a name fate: Add parseutils test parseutils-test: Drop random colors from parsing test vf_pad/scale: use double precision for aspect ratios. build: error on variable-length arrays ppc: swscale: rework yuv2planeX_altivec() ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec() x86: dsputil: kill VLA in gmc_mmx() libspeexenc: Updated commentary to reflect recent changes libspeexenc: Add an option for enabling DTX doc/APIchanges: fill in missing dates and hashes. lavr: bump major to 1 and declare it stable. lavr: change the type of the data buffers to uint8_t**. lavc: deprecate the audio resampling API. Conflicts: cmdutils.h configure doc/APIchanges ffplay.c libavcodec/dwt.h libavcodec/libspeexenc.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavformat/asf.h tests/fate/libavutil.mak tests/ref/fate/parseutils Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Give all anonymously typedeffed structs in headers a nameDiego Biurrun2012-10-061-2/+2
| | | | | | | | Anonymous structs cannot be forward declared and have no benefit.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-291-4/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: adpcm: Clip step_index values read from the bitstream at the beginning of each frame. oma: don't read beyond end of leaf_table. doxygen: Remove documentation for non-existing parameters; misc small fixes. Indeo3: fix crashes on corrupt bitstreams. msmpeg4: Replace forward declaration by proper #include. segment: implement wrap around avf: reorder AVStream and AVFormatContext aacdec: Remove erroneous reference to global gain from the out of bounds scalefactor error message. Conflicts: libavcodec/indeo3.c libavformat/avformat.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: Remove documentation for non-existing parameters; misc small fixes.Diego Biurrun2012-02-281-4/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-291-2/+27
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (53 commits) probe: Restore identification of files with very large id3 tags and no extension. probe: Remove id3 tag presence as a criteria to do file extension checking. mpegts: MP4 SL support mpegts: MP4 OD support mpegts: Add support for Sections in PMT mpegts: Replace the MP4 descriptor parser with a recursive parser. mpegts: Add support for multiple mp4 descriptors mpegts: Parse mpeg2 SL descriptors. isom: Add MPEG4SYSTEMS dummy object type indication. aacdec: allow output reconfiguration on channel changes nellymoserenc: take float input samples instead of int16 nellymoserdec: use dsp functions for overlap and windowing nellymoserdec: do not fail if there is extra data in the packet nellymoserdec: fail if output buffer is too small nellymoserdec: remove pointless buffer size check. lavf: add init_put_byte() to the list of visible symbols. seek-test: free options dictionary after use snow: do not draw_edge if emu_edge is set tools/pktdumper: update to recent avformat api seek-test: update to recent avformat api ... Conflicts: doc/APIchanges libavcodec/mpegaudiodec.c libavcodec/nellymoserdec.c libavcodec/snow.c libavcodec/version.h libavcodec/wmadec.c libavformat/avformat.h libavformat/mpegts.c libavformat/mxfdec.c libavformat/utils.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: MP4 SL supportAlex Converse2011-10-281-0/+18
| |
| * mpegts: Add support for Sections in PMTAlex Converse2011-10-281-1/+3
| |
| * mpegts: Add support for multiple mp4 descriptorsAlex Converse2011-10-281-2/+7
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mpegtsenc: support CODEC_ID_AAC_LATMPeter Ross2011-01-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $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>
* | mpegtsenc: support CODEC_ID_AAC_LATMPeter Ross2011-01-301-0/+1
|/ | | | | | | | | | | | | | | | $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> (cherry picked from commit 4d54df8e07dca3e30ebcaffd1a0e750a876700a2)
* add ff_parse_mpeg2_descriptor; make MPEG2 descriptor parsing routines ↵Peter Ross2010-12-291-0/+18
| | | | | | available to other modules. Originally committed as revision 26125 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix warnings about implicit function declaration when compiling rtpdec.cAlexis Ballier2010-02-011-0/+7
| | | | | | Patch by Alexis Ballier, alexis D ballier A gmail Originally committed as revision 21601 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove useless declarations from mpegts.hBaptiste Coudurier2010-01-131-7/+0
| | | | Originally committed as revision 21205 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mpegts: change variable-length array to fixed lengthMåns Rullgård2009-08-241-0/+2
| | | | | | The difference between 188 and 204 is not worth worrying about. Originally committed as revision 19697 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove definesBaptiste Coudurier2009-05-311-6/+0
| | | | Originally committed as revision 19004 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-191-1/+1
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Globally rename the header inclusion guard names.Stefano Sabatini2008-08-311-3/+3
| | | | | | | | | Consistently apply this rule: the guard name is obtained from the filename by stripping the leading "lib", converting '/' and '.' to '_' and uppercasing the resulting name. Guard names in the root directory have to be prefixed by "FFMPEG_". Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Dirac encapsulation in MPEG-TSAnuradha Suraparaju2008-08-131-0/+1
| | | | | | patch by Anuradha Suraparaju, anuradha rd.bbc.co uk Originally committed as revision 14734 to svn://svn.ffmpeg.org/ffmpeg/trunk
* treat stream_type==0x82 as AUDIO_DTS when the program has a ↵Nico Sabbi2008-02-231-0/+1
| | | | | | REGISTRATION_DESCRIPTOR with the value HDMV; approved by Mans Originally committed as revision 12180 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add FFMPEG_ prefix to all multiple inclusion guards.Diego Biurrun2007-10-171-3/+3
| | | | Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove redundant declaration of mpegts_muxerMåns Rullgård2007-07-081-2/+0
| | | | Originally committed as revision 9541 to svn://svn.ffmpeg.org/ffmpeg/trunk
* comment endif directive tokenBenoit Fouet2007-06-191-1/+1
| | | | Originally committed as revision 9369 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add a comment to indicate which #endif belong to which #defineGuillaume Poirier2007-06-171-1/+1
| | | | Originally committed as revision 9356 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add multiple inclusion guards to headersMåns Rullgård2007-06-171-0/+5
| | | | Originally committed as revision 9345 to svn://svn.ffmpeg.org/ffmpeg/trunk
* include all prerequisites in header filesMåns Rullgård2007-06-161-0/+2
| | | | Originally committed as revision 9344 to svn://svn.ffmpeg.org/ffmpeg/trunk
* demux VC1 in mpegtsNico Sabbi2007-02-091-0/+1
| | | | Originally committed as revision 7902 to svn://svn.ffmpeg.org/ffmpeg/trunk
* "removes definition for old crc func" patch by Daniel Kristjansson / danielk ↵Daniel Kristjansson2007-01-231-1/+0
| | | | | | | | mrl.nyu edu patch ~ 1year old, apparently forgotten by our mpeg-ts demuxer maintainer Originally committed as revision 7673 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change license headers to say 'FFmpeg' instead of 'this program/this library'Diego Biurrun2006-10-071-4/+6
| | | | | | and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
* give AVInput/OutputFormat structs consistent namesMåns Rullgård2006-07-091-1/+1
| | | | Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Update licensing information: The FSF changed postal address.Diego Biurrun2006-01-121-1/+1
| | | | Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
* added support for DVHS (192) packet sizeNico Sabbi2006-01-021-0/+1
| | | | Originally committed as revision 4801 to svn://svn.ffmpeg.org/ffmpeg/trunk
* COSMETICS: Remove all trailing whitespace.Diego Biurrun2005-12-171-1/+1
| | | | Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
* DVB subtitle decoder by (Ian Caulfield: imc25, cam ac uk)Michael Niedermayer2005-07-171-0/+5
| | | | Originally committed as revision 4448 to svn://svn.ffmpeg.org/ffmpeg/trunk
* libdts support by (Benjamin Zores <ben at geexbox dot org>)Michael Niedermayer2004-07-141-0/+1
| | | | Originally committed as revision 3310 to svn://svn.ffmpeg.org/ffmpeg/trunk
* h264 in mpeg-ts fix by (Måns Rullgård <mru at kth dot se>)Michael Niedermayer2004-07-071-1/+1
| | | | Originally committed as revision 3293 to svn://svn.ffmpeg.org/ffmpeg/trunk
* support more codecs in MPEG-TS patch by (mru at kth dot se (Måns Rullgård))Måns Rullgård2003-11-121-0/+3
| | | | Originally committed as revision 2511 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mpeg TS demux API (called from RTP layer) - raw mpeg TS reader (uses fake ↵Fabrice Bellard2003-10-291-0/+7
| | | | | | codec MPEG2TS) Originally committed as revision 2446 to svn://svn.ffmpeg.org/ffmpeg/trunk
* - Looks a tiny bit harder in mpegps_probe() for a valid start code. This isIsaac Richards2003-07-101-0/+2
| | | | | | | | | needed to detect some files produced by pvr-250/350 capture cards. - Adds AC3 audio support to the mpegts demuxer, and makes it a little more tolerant of bad files. patch by (Isaac Richards <ijr at po dot cwru dot edu>) Originally committed as revision 2028 to svn://svn.ffmpeg.org/ffmpeg/trunk
* try to filter _all_ PATs if no SDT could be found patch by (<gbazin at ↵Michael Niedermayer2003-06-281-2/+4
| | | | | | | | altern dot org>) + mpegtsenc.c compile fix by me Originally committed as revision 1995 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mpeg ts demux uses DVB SI info and generates correct PTS info - added ↵Fabrice Bellard2003-06-131-0/+40
prototype mpeg ts mux Originally committed as revision 1956 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status