summaryrefslogtreecommitdiffstats
path: root/libavformat/mpegts.c
Commit message (Collapse)AuthorAgeFilesLines
* mpegts: clear avprograms only for removed programsMichael Niedermayer2013-03-101-3/+11
| | | | | | | Fixes Ticket2186 Requested-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'Michael Niedermayer2013-03-081-8/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1afddbe59e96af75f1c07605afc95615569f388f': avpacket: use AVBuffer to allow refcounting the packets. Conflicts: libavcodec/avpacket.c libavcodec/utils.c libavdevice/v4l2.c libavformat/avidec.c libavformat/flacdec.c libavformat/id3v2.c libavformat/matroskaenc.c libavformat/mux.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avpacket: use AVBuffer to allow refcounting the packets.Anton Khirnov2013-03-081-8/+10
| | | | | | | | | | | | This will allow us to avoid copying the packets in many cases. This breaks ABI.
* | Only try to auto-detect LATM in mpegts if the LOAS demuxer was configured.Carl Eugen Hoyos2013-01-241-1/+3
| | | | | | | | This allows to decode LATM-in-mpegts without the LOAS demuxer.
* | Merge commit 'a717f9904227d7979473bad40c50eb40af41d01d'Michael Niedermayer2013-01-211-6/+7
|\ \ | |/ | | | | | | | | | | | | | | * commit 'a717f9904227d7979473bad40c50eb40af41d01d': mpegts: Share the cleanup code between the demuxer and lavf-internal parser functions rtpdec_mpeg4: Return one AAC AU per AVPacket ppc: Include string.h for memset Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Share the cleanup code between the demuxer and lavf-internal parser ↵Martin Storsjö2013-01-201-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | functions The lavf-internal parser functions are used when receiving mpegts over RTP. This fixes memory leaks in this setup. The normal mpegts demuxer close function was updated in ec7d0d2e in 2004 to fix leaks, but the parsing function used for RTP wasn't updated and has been leaking ever since. Signed-off-by: Martin Storsjö <martin@martin.st>
* | mpegts: update AVProgram after pmt changeXBMC2012-12-251-0/+18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: check av_new_stream() return value.Michael Niedermayer2012-12-131-0/+6
| | | | | | | | | | Fixes CID703728 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: demux asynchronous SMPTE 336M Key-Length-Value (KLV) metadataPeter Ross2012-12-091-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f'Michael Niedermayer2012-12-081-10/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '096abfa15052977eed93f0b5e01afd2d47c53c1f': parser: fix large overreads bitstream: add get_bits64() to support reading more than 32 bits at once arm: detect cpu features at runtime on Linux Conflicts: libavcodec/parser.c libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bitstream: add get_bits64() to support reading more than 32 bits at onceMichael Niedermayer2012-12-071-13/+0
| | | | | | | | | | | | | | Also remove a duplicate function in the MPEG-TS demuxer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | mpegts: rename get_bits64 to get_ts64Michael Niedermayer2012-12-081-3/+3
| | | | | | | | | | | | Renaming because of name conflict Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: check that codec is not open in mpegts_find_stream_typeMichael Niedermayer2012-12-031-0/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts_set_stream_info: remove unneeded codec id checkMichael Niedermayer2012-12-031-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: prevent freeing ones own section in pat_cbMichael Niedermayer2012-11-131-0/+3
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: dont set stream info when a decoder has already been opened.Michael Niedermayer2012-11-131-0/+6
| | | | | | | | | | | | | | Fixes assertion failure. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: prevent freeing ones own section in pmt_cbMichael Niedermayer2012-11-131-0/+4
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts_probe: detect files with garbage at the begin.Michael Niedermayer2012-11-011-11/+21
| | | | | | | | | | | | Fixes Ticket1811 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: fuzzy crc check for not so spec compliant filesMichael Niedermayer2012-10-081-3/+14
| | | | | | | | | | | | Fixes Ticket598 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'Michael Niedermayer2012-10-021-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d': avconv: improve sample format negotiation for decoder request Opus encoder using libopus mpegts: Drop pointless casting of hex_dump_debug arguments avformat: const correctness for av_hex_dump / av_hex_dump_log wmadec: Adjust debug printf argument length modifier Conflicts: Changelog ffmpeg.c libavcodec/libopusdec.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Drop pointless casting of hex_dump_debug argumentsDiego Biurrun2012-10-011-3/+3
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-011-2/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avcodec: Convert some commented-out printf/av_log instances to av_dlog avcodec: Drop silly and/or broken printf debug output avcodec: Drop some silly commented-out av_log() invocations avformat: Convert some commented-out printf/av_log instances to av_dlog avformat: Remove non-compiling and/or silly commented-out printf/av_log statements Remove some silly disabled code. ac3dec: ensure get_buffer() gets a buffer for the correct number of channels Conflicts: libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h264.c libavcodec/h264_parser.c libavcodec/mjpegdec.c libavcodec/motion_est_template.c libavcodec/mpegaudiodec.c libavcodec/mpegvideo_enc.c libavcodec/put_bits.h libavcodec/ratecontrol.c libavcodec/wmaenc.c libavdevice/timefilter.c libavformat/asfdec.c libavformat/avidec.c libavformat/avienc.c libavformat/flvenc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Convert some commented-out printf/av_log instances to av_dlogDiego Biurrun2012-10-011-2/+4
| |
* | Merge commit '07584eaf4a95db3f11d3bc411f9786932829e82b'Michael Niedermayer2012-09-131-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '07584eaf4a95db3f11d3bc411f9786932829e82b': mpegts: check substreams before discarding Add a smooth streaming segmenter muxer file: Add an avoption for disabling truncating existing files on open img2dec: always close AVIOContexts rtpdec_jpeg: Error out on other unsupported type values as well rtpdec_jpeg: Disallow using the reserved q values rtpdec_jpeg: Fold the default qtables case into an existing if statement rtpdec_jpeg: Store and reuse old qtables for q values 128-254 rtpdec_jpeg: Simplify the calculation of the number of qtables rtpdec_jpeg: Add more comments about the fields in the SOF0 section rtpdec_jpeg: Clarify where the subsampling magic numbers come from rtpdec_jpeg: Don't use a bitstream writer for the EOI marker rtpdec_jpeg: Don't needlessly use a bitstream writer for the header rtpdec_jpeg: Simplify writing of the jpeg header rtpdec_jpeg: Merge two if statements rtpdec_jpeg: Write the DHT section properly Conflicts: libavformat/Makefile libavformat/allformats.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: check substreams before discardingChristian Schmidt2012-09-121-1/+2
| | | | | | | | | | | | Allow to extract the AC3 core from TrueHD with the "copy" codec. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | mpegts: Fix potential memory leak in mpegts_read_packet()Michael Niedermayer2012-09-081-0/+1
| | | | | | | | | | | | | | This leak can happen in case of some error paths. Found-by: Tanami, Ohad Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-051-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union memberMartin Storsjö2012-09-041-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-54/+54
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-071-52/+52
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-311-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpc8: return more meaningful error codes. mpc: return more meaningful error codes. wv,mpc8: don't return apetag data in packets. rtmp: do not warn about receiving metadata packets x86: h264dsp: Adjust YASM #ifdefs x86: yadif: Mark mmxext optimizations as such h264: convert loop filter strength dsp function to yasm. Improve descriptiveness of a number of codec and container long names Conflicts: libavcodec/flvdec.c libavcodec/libopenjpegdec.c libavformat/apetag.c libavformat/mp3dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Improve descriptiveness of a number of codec and container long namesDiego Biurrun2012-07-301-2/+2
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-191-94/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (24 commits) flvdec: remove incomplete, disabled seeking code mem: add support for _aligned_malloc() as found on Windows lavc: Extend the documentation for avcodec_init_packet flvdec: remove incomplete, disabled seeking code http: replace atoll() with strtoll() mpegts: remove unused/incomplete/broken seeking code af_amix: allow float planar sample format as input af_amix: use AVFloatDSPContext.vector_fmac_scalar() float_dsp: add x86-optimized functions for vector_fmac_scalar() float_dsp: Move vector_fmac_scalar() from libavcodec to libavutil lavr: Add x86-optimized function for flt to s32 conversion lavr: Add x86-optimized function for flt to s16 conversion lavr: Add x86-optimized functions for s32 to flt conversion lavr: Add x86-optimized functions for s32 to s16 conversion lavr: Add x86-optimized functions for s16 to flt conversion lavr: Add x86-optimized function for s16 to s32 conversion rtpenc: Support packetizing iLBC rtpdec: Add a depacketizer for iLBC Implement the iLBC storage file format mov: Support muxing/demuxing iLBC ... Conflicts: Changelog configure libavcodec/avcodec.h libavcodec/dsputil.c libavcodec/version.h libavformat/movenc.c libavformat/mpegts.c libavformat/version.h libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: remove unused/incomplete/broken seeking codeRonald S. Bultje2012-06-191-96/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-071-8/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegts: Remove disabled extension matching probe. fate: avoid freopen(NULL) in videogen/rotozoom Conflicts: tests/rotozoom.c tests/videogen.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Remove disabled extension matching probe.Alex Converse2012-06-071-8/+0
| |
| * mpegts: Some additional HDMV types and reg descriptors for mpegtsJoakim Plate2012-05-031-0/+6
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | mpegts: fix handling of files smaller than 8kbMichael Niedermayer2012-05-141-4/+2
| | | | | | | | | | | | | | Fixes Ticket1094 Analyzed-by: mjs973 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-271-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | * qatar/master: mpegts: Make sure we don't return uninitialized packets gitignore: replace library catch-all pattern by more specific patterns Conflicts: .gitignore Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Make sure we don't return uninitialized packetsMartin Storsjö2012-04-271-0/+3
| | | | | | | | | | | | | | | | | | This fixes crashes, where the demuxer could return 0 even if the returned AVPacket isn't initialized at all. This could happen if running into EOF or running out of probesize with non-seekable sources. Signed-off-by: Martin Storsjö <martin@martin.st>
| * mpegts: Try seeking back even for nonseekable protocolsMartin Storsjö2012-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mpegts demuxer reads 5 KB at startup just for discovering the packet size. Since the default avio buffer size is 32 KB, the seek back to the start will in most cases be within the avio buffer, and will in most cases succeed even if the actual protocol isn't seekable. This makes the demuxer startup faster/with less data when reading data from a non-seekable input, by not skipping the first few KB. If it fails, don't warn if the protocol isn't seekable, making it behave as before in the failure case. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-061-5/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: cosmetics: Align muxer/demuxer declarations mpeg12: Do not change frame_pred_frame_dct flag and demote error into a warning avcodec: remove avcodec_guess_channel_layout() avutil: Add av_get_default_channel_layout() Conflicts: doc/APIchanges libavcodec/mpeg12.c libavformat/cdg.c libavformat/matroskaenc.c libavformat/mpegts.c libavformat/nuv.c libavformat/wav.c libavutil/audioconvert.c libavutil/audioconvert.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Align muxer/demuxer declarationsMartin Storsjö2012-04-061-5/+5
| | | | | | | | | | | | | | Also add missing trailing commas, break long codec_tag lines and add spaces in codec_tag declarations. Signed-off-by: Martin Storsjö <martin@martin.st>
* | mpegts: fix a unused function warningMichael Niedermayer2012-04-021-1/+1
| | | | | | | | | | | | note the function is used under #if Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-271-6/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: make av_interleaved_write_frame() flush packets when pkt is NULL mpegts: Fix dead error checks vc1: Do not read from array if index is invalid. targa: convert to bytestream2. rv34: set mb_num_left to 0 after finishing a frame Conflicts: libavcodec/targa.c libavcodec/vc1data.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Fix dead error checksAlex Converse2012-03-261-6/+12
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-101-2/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix a bunch of common typos. build: Skip compiling xvmc.h under the correct condition. configure: darwin: Change dylib install names to include major version. mpegts: Always honor a registration descriptor if present and there is no other codec information. aacdec: Fix SCE parity check. aacdec: Fix out of array writes (stack). rtsp: Only set the ttl parameter if the server actually gave a value udp: Set ttl for read-write streams, too, not only for write-only ones udp: Only bind to the multicast address if in read-only mode udp: Clarify the comment about binding the multicast address udp: Reorder comments Conflicts: libavcodec/aacdec.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Always honor a registration descriptor if present and there is no ↵Alex Converse2012-03-091-2/+1
| | | | | | | | other codec information.
* | Cosmetics: Remove superfluous newline.Carl Eugen Hoyos2012-03-091-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-041-6/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: tiertexseq: set correct block_align for audio tiertexseq: set audio stream start time to 0 voc/avs: Do not change the sample rate mid-stream. segafilm: use the sample rate as the time base for audio streams ea: fix audio pts psx-str: fix audio pts vqf: set packet duration tta demuxer: set packet duration mpegaudio_parser: do not ignore information from the first parsed frame mpegaudio_parser: be less picky about the start position thp: set audio packet durations avcodec: add a Vorbis parser to get packet duration vorbisdec: read the previous window flag for long windows lavc: free the output packet when encoding failed or produced no output. lavc: preserve avpkt->destruct in ff_alloc_packet(). lavc: clarify the meaning of AVCodecContext.frame_number. mpegts: Pad the packet buffer in handle_packet(). mpegts: Do not call read_sl_header() when no bytes remain in the buffer. Conflicts: libavcodec/mpegaudio_parser.c libavcodec/version.h libavformat/mpegts.c tests/ref/fate/pva-demux Merged-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud