summaryrefslogtreecommitdiff
path: root/libavformat/nut.h
Commit message (Collapse)AuthorAgeFilesLines
* avformat/nutenc: add mode that omits the indexMichael Niedermayer2014-05-291-0/+1
| | | | | | | When the index is not written, several data tables become unneeded, reducing memory and cpu requirements. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'c94e2e85cb6af8a570d8542a830556243bd32873'Michael Niedermayer2014-05-291-2/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c94e2e85cb6af8a570d8542a830556243bd32873': nut: Support experimental NUT 4 features Conflicts: doc/nut.texi libavformat/nut.h libavformat/nutdec.c libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: Support experimental NUT 4 featuresLuca Barbato2014-05-281-1/+8
| | | | | | | | | | | | | | Add the low overhead pipe mode and the extended broadcast mode. Export the options as 'syncponts' since it impacts only that. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * nut: Fix unchecked allocationsDerek Buitenhuis2013-10-221-1/+1
| | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avformat/nut: add ff_nut_audio_extra_tags to demuxer tooMichael Niedermayer2014-04-091-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nut: add support for per frame side & meta data with version 4Michael Niedermayer2014-01-041-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nut: add minor_version field with version>=4Michael Niedermayer2013-12-251-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/nut: store version in the contextMichael Niedermayer2013-12-251-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nut: Fix unchecked allocationsDerek Buitenhuis2013-10-221-1/+1
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d'Michael Niedermayer2013-05-161-3/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d': Remove commented-out #includes h263dec: Remove broken and disabled debug cruft vc1: Reindent INIT_LUT(), align backslashes Conflicts: libavcodec/vc1.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove commented-out #includesDiego Biurrun2013-05-151-3/+0
| |
* | Merge commit '46c1917350f58dfab84e41919e6c02d43950db8c'Michael Niedermayer2013-05-061-0/+2
|\ \ | |/ | | | | | | | | | | | | * commit '46c1917350f58dfab84e41919e6c02d43950db8c': nut: use a define for the nut version bgmc: Do not mark ff_bgmc_decode_init() as av_cold Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: use a define for the nut versionLuca Barbato2013-05-061-0/+2
| | | | | | | | Ease switching version in the future and make evident why that value.
* | Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'Michael Niedermayer2012-11-291-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bfe5454cd238b16e7977085f880205229103eccb': lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h lavf: move "MP3 " fourcc from riff to nut fate: vpx: Add dependencies fate: Fix wavpack-matroskamode test dependencies x86: dsputilenc: port to cpuflags Conflicts: libavformat/internal.h libavformat/nut.c tests/fate/vpx.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.hJustin Ruggles2012-11-281-1/+1
| |
* | Merge commit '381dc1a5ec0925b281c573457c413ae643567086'Michael Niedermayer2012-10-301-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '381dc1a5ec0925b281c573457c413ae643567086': fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups fate: Add shorthands for acodec PCM and ADPCM tests avconv: Drop unused function argument from do_video_stats() cmdutils: Conditionally compile libswscale-related bits aacenc: Drop some unused function arguments rtsp: Avoid a cast when calling strtol nut: support textual data nutenc: verbosely report unsupported negative pts Conflicts: cmdutils.c ffmpeg.c libavformat/nut.c libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: support textual dataLuca Barbato2012-10-291-0/+1
| | | | | | | | Plain text (utf8 encoded) data can be muxed and demuxed in nut.
* | Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'Michael Niedermayer2012-10-141-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520': configure: tms470: add mapping for -mfpu=vfpv3-d16 flag configure: recognise Minix as OS configure: work around bug in ash shell eval-test: make table static const lavr: handle clipping in the float to s32 conversion nut: support pcm codecs not mapped in avi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: support pcm codecs not mapped in aviLuca Barbato2012-10-131-0/+1
| | | | | | | | The native tags will be used when available.
* | Merge commit '1bd442c276e6688b43777a198cad0d7e3a92123f'Michael Niedermayer2012-10-141-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1bd442c276e6688b43777a198cad0d7e3a92123f': nut: prioritize native tags Conflicts: tests/ref/lavfi/crop tests/ref/lavfi/crop_scale tests/ref/lavfi/crop_scale_vflip tests/ref/lavfi/crop_vflip tests/ref/lavfi/null tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_crop tests/ref/lavfi/pixfmts_hflip tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_pad tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip tests/ref/lavfi/scale200 tests/ref/lavfi/scale500 tests/ref/lavfi/vflip tests/ref/lavfi/vflip_crop tests/ref/lavfi/vflip_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: prioritize native tagsLuca Barbato2012-10-131-0/+2
| | | | | | | | | | Use native tags instead of avi ones, simplifies a lot raw video codecs handling.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-061-6/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-6/+6
| | | | | | | | Anonymous structs cannot be forward declared and have no benefit.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | nutenc: keep track of max_ptsMichael Niedermayer2012-08-261-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutenc: keep track if keyframe PTSMichael Niedermayer2012-08-261-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutenc: keep track of the written syncpoint countMichael Niedermayer2012-08-261-0/+1
|/ | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* nutenc: mux chapters.Anton Khirnov2011-03-171-0/+5
| | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* Define ff_nut_video_tags and make Nut muxer and demuxer set it inStefano Sabatini2010-05-231-0/+1
| | | | | | codec_tag. Originally committed as revision 23259 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix NUT (de)muxer warnings:Vitor Sessak2010-03-281-2/+2
| | | | | | | | | | | | | | | | | CC libavformat/nutdec.o libavformat/nutdec.c: In function ‘read_seek’: libavformat/nutdec.c:862: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type ./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’ libavformat/nutdec.c:871: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type ./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’ libavformat/nutdec.c:879: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type ./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’ CC libavformat/nutenc.o libavformat/nutenc.c: In function ‘write_packet’: libavformat/nutenc.c:680: warning: passing argument 3 of ‘av_tree_find’ from incompatible pointer type ./libavutil/tree.h:44: note: expected ‘int (*)(void *, const void *)’ but argument is of type ‘int (*)(struct Syncpoint *, struct Syncpoint *)’ Originally committed as revision 22707 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Plug memory leak in NUT muxer and demuxerVitor Sessak2010-03-031-0/+1
| | | | Originally committed as revision 22174 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Introduce metadata conversion table for NUT muxer and demuxer.Anton Khirnov2010-02-241-0/+3
| | | | | | | Patch by Anton Khirnov (wyskas, do no evil mail) Thread "[PATCH] nut metadata conversion table" Originally committed as revision 22015 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove misleading comment, _t is POSIX-reserved namespace.Diego Biurrun2008-12-131-1/+1
| | | | Originally committed as revision 16105 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove comment suggesting using variables ending in _t as this would break ↵Michael Niedermayer2008-12-111-1/+1
| | | | | | POSIX. Originally committed as revision 16061 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove _t for POSIX compatibility.Michael Niedermayer2008-12-111-4/+4
| | | | Originally committed as revision 16057 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
* Revert r14497Michael Niedermayer2008-08-011-1/+0
| | | | | | | | | Log: Add missing header #includes. Policy violation (change not approved by maintainer) and while discussions where ongoing and no consensus has been reached. Originally committed as revision 14500 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add missing header #includes.Diego Biurrun2008-08-011-0/+1
| | | | Originally committed as revision 14497 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full path for #includes from another directory.Diego Biurrun2008-05-091-2/+2
| | | | Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add 'disposition' bitfield to AVStream and use it for both muxing and demuxingEvgeniy Stepanov2008-03-071-0/+7
| | | | | | of matroska and nut. Originally committed as revision 12358 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Subtitle support. (untested)Michael Niedermayer2008-03-051-0/+2
| | | | Originally committed as revision 12330 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Elision header demuxing support.Michael Niedermayer2008-02-151-0/+3
| | | | Originally committed as revision 11935 to svn://svn.ffmpeg.org/ffmpeg/trunk
* update flagsMichael Niedermayer2008-02-131-0/+2
| | | | Originally committed as revision 11929 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rename av_crc04C11DB7_update to ff_crc04C11DB7_update and move it to ↵Baptiste Coudurier2007-10-301-2/+0
| | | | | | aviobuf.c so it can be reused by other (de)muxers Originally committed as revision 10873 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
* spelling/wording cosmeticsDiego Biurrun2007-08-171-3/+3
| | | | Originally committed as revision 10131 to svn://svn.ffmpeg.org/ffmpeg/trunk
* header repetitionMichael Niedermayer2007-08-101-0/+1
| | | | Originally committed as revision 10051 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move syncpoint cache related stuff to common fileMichael Niedermayer2007-08-091-0/+3
| | | | Originally committed as revision 10038 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move lsb2full to common fileMichael Niedermayer2007-08-091-0/+1
| | | | Originally committed as revision 10025 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move crc wrapper to slightly better spotMichael Niedermayer2007-08-091-6/+1
| | | | Originally committed as revision 10022 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status