aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* mxfdec: Set DTS and PTS on video packetsTomas Härdin2011-12-121-1/+95
| | | | | | This involves computing DTS/PTS from the index tables. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mxfdec: Only sort IndexTableSegments onceTomas Härdin2011-12-121-30/+28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mxfdec: Add Avid's essence element keyTomas Härdin2011-12-121-1/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mxfdec: Add support for Avid indexesTomas Härdin2011-12-121-12/+56
| | | | | | | | These indexes duplicate every entry and have the total size of the essence container as the last entry. This patch also computes the size of the packets when unknown. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mxfdec: Check slice_count before freeing slice_offset_entriesTomas Härdin2011-12-121-0/+1
| | | | | | This fixes SIGSEGV on sliceless (single stream) VBR files Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mxfdec: Bring back accumulated_offset that was removed in 5e67e3eTomas Härdin2011-12-121-1/+7
| | | | | | | | I thought it had to do with file offsets, but's actually the offset inside the essence container. In other words, unbreak multiple EditUnitByteCounts. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* timecode: rename internal ff_* symbols to avpriv_*.Clément Bœsch2011-12-122-8/+8
| | | | | | Those functions are shared between libs. Also fix a typo in function names: smtpe → smpte.
* seek-test: use standard format specifiers in snprintf()Michael Niedermayer2011-12-121-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-1236-108/+147
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: cabac: replace explicit memory references with "m" operands avplay: don't request a stereo downmix wmapro: use av_float2int() lavc: avoid invalid memcpy() in avcodec_default_release_buffer() lavu: replace int/float punning functions lavfi: install libavfilter/vsrc_buffer.h Remove extraneous semicolons sdp: Restore the original mp4 format h264 extradata if converted rtpenc: Add support for mp4 format h264 rtpenc: Simplify code by introducing a separate end pointer movenc: Use the actual converted sample for RTP hinting Fix a bunch of common typos. Conflicts: doc/developer.texi doc/eval.texi doc/filters.texi doc/protocols.texi ffmpeg.c ffplay.c libavcodec/mpegvideo.h libavcodec/x86/cabac.h libavfilter/Makefile libavformat/avformat.h libavformat/cafdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/gxfenc.c libavformat/img2.c libavformat/movenc.c libavformat/mpegts.c libavformat/rtpenc_h264.c libavformat/utils.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: replace int/float punning functionsMans Rullgard2011-12-1120-67/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing functions defined in intfloat_readwrite.[ch] are both slow and incorrect (infinities are not handled). This introduces a new header with fast, inline conversion functions using direct union punning assuming an IEEE-754 system, an assumption already made throughout the code. The one use of Intel/Motorola extended 80-bit format is replaced by simpler code sufficient under the present constraints (positive normal values). The old functions are marked deprecated and retained for compatibility. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Remove extraneous semicolonsMans Rullgard2011-12-112-2/+2
| | | | | | | | | | | | These semicolons cause invalid empty top-level declarations. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * sdp: Restore the original mp4 format h264 extradata if convertedMartin Storsjö2011-12-111-0/+17
| | | | | | | | | | | | | | | | | | If the sdp is generated before the rtp muxer is initialized (e.g. as when called from the rtsp muxer), this has to be done, otherwise the rtp muxer doesn't know that the input really is in mp4 format. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpenc: Add support for mp4 format h264Luca Abeni2011-12-111-3/+28
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpenc: Simplify code by introducing a separate end pointerMartin Storsjö2011-12-111-5/+5
| | | | | | | | | | | | Also remove redundant parentheses. Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc: Use the actual converted sample for RTP hintingMartin Storsjö2011-12-113-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | If an annex b bitstream is muxed into mov, the actual written sample is reformatted to mp4 syntax before writing. Currently, the RTP hints that copy data from the normal video track, where the payload data might be offset compared to the original sample that the RTP hinting used (when 3 byte annex b startcodes have been converted into 4 byte mp4 format startcodes). Signed-off-by: Martin Storsjö <martin@martin.st>
| * Fix a bunch of common typos.Diego Biurrun2011-12-1114-21/+22
| |
* | seektest: floatfreeMichael Niedermayer2011-12-111-3/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Support VP8 in NSV.Reimar Döffinger2011-12-111-0/+1
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-116-50/+122
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) Warn about avserver being broken. avconv: drop code for special handling of avserver streams. rawdec: don't set codec timebase. lavf doxy: add muxing stuff to lavf_encoding group lavf doxy: add demuxing stuff to lavf_decoding group lavf doxy: expand/reword metadata API doxy. lavf doxy: add installed headers to groups. lavf doxy: add avio groups into the lavf_io group. lavf doxy: rename lavf I/O group to lavf_io. lavf doxy: add metadata docs to the main lavf group ttadec: check channel count as read from extradata. Add CLJR encoding and decoding regression tests cljr: remove unused code flacdec: Support for tracks in cuesheet metadata block ptx: fix inverted check for sufficient data flac muxer: fix writing of file header and STREAMINFO header from extradata ptx: emit a warning on insufficient picture data utvideo: add fate tests covering all codec variants doc: update to refer to avconv doc: remove some stale entries from the faq ... Conflicts: Changelog avconv.c doc/avconv.texi doc/faq.texi doc/ffplay.texi doc/ffprobe.texi doc/ffserver.texi libavcodec/avcodec.h libavcodec/cljr.c libavformat/avformat.h libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rawdec: don't set codec timebase.Anton Khirnov2011-12-101-1/+1
| | | | | | | | | | It's not supposed to be set outside of lavc. Set r_frame_rate and avg_frame_rate instead.
| * lavf doxy: add muxing stuff to lavf_encoding groupAnton Khirnov2011-12-101-4/+14
| |
| * lavf doxy: add demuxing stuff to lavf_decoding groupAnton Khirnov2011-12-101-8/+21
| |
| * lavf doxy: expand/reword metadata API doxy.Anton Khirnov2011-12-101-2/+8
| |
| * lavf doxy: add installed headers to groups.Anton Khirnov2011-12-103-0/+13
| |
| * lavf doxy: add avio groups into the lavf_io group.Anton Khirnov2011-12-101-0/+3
| |
| * lavf doxy: rename lavf I/O group to lavf_io.Anton Khirnov2011-12-101-1/+1
| |
| * lavf doxy: add metadata docs to the main lavf groupAnton Khirnov2011-12-101-0/+1
| |
| * flacdec: Support for tracks in cuesheet metadata blockPaul B Mahol2011-12-101-0/+27
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
| * flac muxer: fix writing of file header and STREAMINFO header from extradataJustin Ruggles2011-12-101-6/+4
| | | | | | | | fixes Bug 119
| * Dxtory capture format decoderKostya Shishkov2011-12-101-0/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | rtmpproto: make condition work in overflow case.Reimar Döffinger2011-12-101-1/+1
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Make detection of single-stream flv work again.Reimar Döffinger2011-12-101-4/+5
| | | | | | | | | | | | | | | | It had become dead code when code was added to avoid exporting audio and video codec id as metadata. Untested due to lack of sample. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Separate mxf_essence_container_uls for audio and video.Carl Eugen Hoyos2011-12-101-3/+6
| | | | | | | | | | | | | | It is a really bad idea to assign a video codec id when we have set codec_type to audio and vice versa. Fixes ticket #721.
* | mxfdec: do not try to use an obviously broken index.Reimar Döffinger2011-12-101-4/+23
| | | | | | | | | | | | Also fixes a memleak. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | avi: add escape130 supportMichael Niedermayer2011-12-101-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wavdec: add ignore length option to ignore incorrect lengthesMichael Niedermayer2011-12-101-0/+17
| | | | | | | | | | | | like SOX Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-106-105/+699
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: isom: sort and pretty-print codec_movaudio_tags[] isom: remove pointless comments in codec_movaudio_tags[] isom: remove commented-out tag for vorbis movenc: write 'chan' tag for AC-3 in MOV mov: add support for reading and writing the 'chan' tag audioconvert: add some additional channel and channel layout macros audioconvert: change 7.1 "wide" layout to use side surround channels movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs doc: update documentation to use avconv doc: update demuxers section doc: extend external library coverage doc: split platform specific information doc: port the git-howto to texinfo doc: provide fallback css and customize @float doc: document fate in a texinfo doxy: change hue value to match our green Conflicts: doc/fate.txt doc/ffserver.texi doc/general.texi doc/muxers.texi doc/protocols.texi doc/t2h.init libavformat/isom.c libavformat/mov.c libavutil/avutil.h tests/ref/acodec/pcm_s16be tests/ref/acodec/pcm_s24be tests/ref/acodec/pcm_s32be tests/ref/acodec/pcm_s8 tests/ref/lavf/mov Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * isom: sort and pretty-print codec_movaudio_tags[]Justin Ruggles2011-12-091-55/+42
| | | | | | | | | | original order is retained within the same tag or codec id to maintain the muxing/demuxing priority.
| * isom: remove pointless comments in codec_movaudio_tags[]Justin Ruggles2011-12-091-17/+17
| |
| * isom: remove commented-out tag for vorbisJustin Ruggles2011-12-091-2/+0
| |
| * movenc: write 'chan' tag for AC-3 in MOVJustin Ruggles2011-12-091-0/+1
| |
| * mov: add support for reading and writing the 'chan' tagJustin Ruggles2011-12-095-2/+636
| | | | | | | | | | | | This implements reading the tag in the demuxer and adds support for writing it in the muxer. Some example channel layout tables for muxing are included for ac3, aac, and alac, but they are not utilized yet.
| * movenc: simplify handling of pcm vs. adpcm vs. other compressed codecsJustin Ruggles2011-12-091-43/+18
| | | | | | | | | | | | Use Sound Sample Description Version 2 for all MOV files. Updated FATE references accordingly. Note that ADPCM is treated as compressed audio in version 2.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-092-5/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: cljr: K&R cosmetics cljr: return a more sensible value when encountering invalid headers cljr: drop unnecessary emms_c() calls without MMX code cljr: remove useless casts cljr: group encode/decode parts under single ifdefs cljr: remove stray semicolon cljr: add missing return statement in decode_end() doc: add pulseaudio to the input list avconv: remove unsubstantiated comment shorten: avoid abort() on unknown audio types cljr: add encoder build: merge lists of HTML documentation targets tests/examples: Mark some variables only used within their files as static. tests/tools/examples: Replace direct exit() calls by return. x86 cpuid: set vendor union members separately cljr: release picture at end of decoding rv40: NEON optimised rv40 qpel motion compensation Conflicts: doc/examples/muxing.c libavcodec/cljr.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cljr: add encoderPaul B Mahol2011-12-081-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * tests/examples: Mark some variables only used within their files as static.Diego Biurrun2011-12-081-8/+8
| |
| * tests/tools/examples: Replace direct exit() calls by return.Diego Biurrun2011-12-082-9/+8
| |
* | Merge remote-tracking branch 'tjoppen/opatom_demuxing_and_seeking'Michael Niedermayer2011-12-081-64/+401
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tjoppen/opatom_demuxing_and_seeking: mxfdec: Index table driven demuxing and seeking mxfdec: Compute packet offsets properly mxfdec: Use MaterialPackage - Track - TrackID instead of the system_item hack mxfdec: Parse more values in PartitionPack mxfdec: Parse TemporalOffsets mxfdec: av_dlog():ify 'no corresponding source package found' mxfdec: Compute essence container offsets and lengths into mxf->partitions mxfdec: Make mxf->partitions sorted by offset mxfdec: Parse ThisPartition mxfdec: Speed up metadata and index parsing mxfdec: Make sure DataDefinition is consistent between material track and source track mxfdec: Add EssenceContainer UL found in 0001GL00.MXF.A1.mxf_opatom.mxf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mxfdec: Index table driven demuxing and seekingTomas Härdin2011-12-081-3/+97
| | | | | | | | | | | | | | | This adds OPAtom support and proper seeking. D-10 and non-seekable OP1a streams still use the old demuxing/seeking code.
| * | mxfdec: Compute packet offsets properlyTomas Härdin2011-12-081-23/+38
| | | | | | | | | | | | This replaces the old essence_offset code
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 11:06:32 +0000