summaryrefslogtreecommitdiff
path: root/libavformat/nut.h
Commit message (Collapse)AuthorAge
* Merge commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d'Michael Niedermayer2013-05-16
|\ | | | | | | | | | | | | | | | | | | | | | | * 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-15
| |
* | Merge commit '46c1917350f58dfab84e41919e6c02d43950db8c'Michael Niedermayer2013-05-06
|\| | | | | | | | | | | | | | | * 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-06
| | | | | | | | Ease switching version in the future and make evident why that value.
* | Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'Michael Niedermayer2012-11-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-28
| |
* | Merge commit '381dc1a5ec0925b281c573457c413ae643567086'Michael Niedermayer2012-10-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-29
| | | | | | | | Plain text (utf8 encoded) data can be muxed and demuxed in nut.
* | Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'Michael Niedermayer2012-10-14
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-13
| | | | | | | | The native tags will be used when available.
* | Merge commit '1bd442c276e6688b43777a198cad0d7e3a92123f'Michael Niedermayer2012-10-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-13
| | | | | | | | | | Use native tags instead of avi ones, simplifies a lot raw video codecs handling.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-06
| | | | | | | | Anonymous structs cannot be forward declared and have no benefit.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | nutenc: keep track of max_ptsMichael Niedermayer2012-08-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutenc: keep track if keyframe PTSMichael Niedermayer2012-08-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | nutenc: keep track of the written syncpoint countMichael Niedermayer2012-08-26
|/ | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* nutenc: mux chapters.Anton Khirnov2011-03-17
| | | | 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-23
| | | | | | codec_tag. Originally committed as revision 23259 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix NUT (de)muxer warnings:Vitor Sessak2010-03-28
| | | | | | | | | | | | | | | | | 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-03
| | | | Originally committed as revision 22174 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Introduce metadata conversion table for NUT muxer and demuxer.Anton Khirnov2010-02-24
| | | | | | | 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-13
| | | | 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-11
| | | | | | POSIX. Originally committed as revision 16061 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove _t for POSIX compatibility.Michael Niedermayer2008-12-11
| | | | Originally committed as revision 16057 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Globally rename the header inclusion guard names.Stefano Sabatini2008-08-31
| | | | | | | | | 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-01
| | | | | | | | | 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-01
| | | | Originally committed as revision 14497 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full path for #includes from another directory.Diego Biurrun2008-05-09
| | | | 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-07
| | | | | | of matroska and nut. Originally committed as revision 12358 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Subtitle support. (untested)Michael Niedermayer2008-03-05
| | | | Originally committed as revision 12330 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Elision header demuxing support.Michael Niedermayer2008-02-15
| | | | Originally committed as revision 11935 to svn://svn.ffmpeg.org/ffmpeg/trunk
* update flagsMichael Niedermayer2008-02-13
| | | | 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-30
| | | | | | 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-17
| | | | Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
* spelling/wording cosmeticsDiego Biurrun2007-08-17
| | | | Originally committed as revision 10131 to svn://svn.ffmpeg.org/ffmpeg/trunk
* header repetitionMichael Niedermayer2007-08-10
| | | | Originally committed as revision 10051 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move syncpoint cache related stuff to common fileMichael Niedermayer2007-08-09
| | | | Originally committed as revision 10038 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move lsb2full to common fileMichael Niedermayer2007-08-09
| | | | Originally committed as revision 10025 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move crc wrapper to slightly better spotMichael Niedermayer2007-08-09
| | | | Originally committed as revision 10022 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move syncpoint timestamp resetting code to a common fileMichael Niedermayer2007-08-09
| | | | Originally committed as revision 10020 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use a dynamic ByteIOContext instead of using the lavf bufferMichael Niedermayer2007-08-09
| | | | | | | this makes the code work with big packets, it is also simpler and saves a byte or 2 Originally committed as revision 10015 to svn://svn.ffmpeg.org/ffmpeg/trunk
* make StreamContext.time_base a pointerMichael Niedermayer2007-08-09
| | | | Originally committed as revision 10010 to svn://svn.ffmpeg.org/ffmpeg/trunk
* variables needed for muxerMichael Niedermayer2007-08-09
| | | | Originally committed as revision 10009 to svn://svn.ffmpeg.org/ffmpeg/trunk
* license header consistency cosmeticsDiego Biurrun2007-07-05
| | | | Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add missing comment markers to #endif directive.Diego Biurrun2007-07-02
| | | | Originally committed as revision 9455 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add a comment to indicate which #endif belong to which #defineGuillaume Poirier2007-06-17
| | | | Originally committed as revision 9356 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add multiple inclusion guards to headersMåns Rullgård2007-06-17
| | | | Originally committed as revision 9345 to svn://svn.ffmpeg.org/ffmpeg/trunk
* misc spelling fixesDiego Biurrun2007-06-12
| | | | Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-09 02:06:42 +0000