Commit Graph

36 Commits

Author SHA1 Message Date
Mans Rullgard 2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Anton Khirnov 073f8b10d8 nutenc: mux chapters.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-03-17 03:34:16 +01:00
Stefano Sabatini 2e01def0fe Define ff_nut_video_tags and make Nut muxer and demuxer set it in
codec_tag.

Originally committed as revision 23259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 18:34:15 +00:00
Vitor Sessak f990f6e3f7 Fix NUT (de)muxer warnings:
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
2010-03-28 09:59:58 +00:00
Vitor Sessak 4b83fc0fe4 Plug memory leak in NUT muxer and demuxer
Originally committed as revision 22174 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-03 17:31:24 +00:00
Anton Khirnov 43382b5f13 Introduce metadata conversion table for NUT muxer and demuxer.
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
2010-02-24 06:27:12 +00:00
Diego Biurrun 3445c7992b Remove misleading comment, _t is POSIX-reserved namespace.
Originally committed as revision 16105 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 16:08:31 +00:00
Michael Niedermayer 089e1bcf10 Remove comment suggesting using variables ending in _t as this would break POSIX.
Originally committed as revision 16061 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-11 20:02:15 +00:00
Michael Niedermayer 52afa376b8 remove _t for POSIX compatibility.
Originally committed as revision 16057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-11 19:06:24 +00:00
Stefano Sabatini 987903826b Globally rename the header inclusion guard names.
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
2008-08-31 07:39:47 +00:00
Michael Niedermayer c5e56a813b Revert r14497
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
2008-08-01 22:29:29 +00:00
Diego Biurrun 2e11268ea9 Add missing header #includes.
Originally committed as revision 14497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-01 16:29:26 +00:00
Diego Biurrun 245976da2a Use full path for #includes from another directory.
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +00:00
Evgeniy Stepanov 90c2295b24 Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
of matroska and nut.

Originally committed as revision 12358 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-07 19:25:09 +00:00
Michael Niedermayer 1326621c1a Subtitle support. (untested)
Originally committed as revision 12330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 13:06:49 +00:00
Michael Niedermayer 3b4f69ae8c Elision header demuxing support.
Originally committed as revision 11935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-15 02:36:09 +00:00
Michael Niedermayer 42abeeae3f update flags
Originally committed as revision 11929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 20:01:09 +00:00
Baptiste Coudurier 992e78f5f2 rename av_crc04C11DB7_update to ff_crc04C11DB7_update and move it to aviobuf.c so it can be reused by other (de)muxers
Originally committed as revision 10873 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-30 00:01:25 +00:00
Diego Biurrun 5b21bdabe4 Add FFMPEG_ prefix to all multiple inclusion guards.
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-17 09:37:46 +00:00
Diego Biurrun 93951943ec spelling/wording cosmetics
Originally committed as revision 10131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-17 10:45:50 +00:00
Michael Niedermayer 14b3f9961f header repetition
Originally committed as revision 10051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-10 12:59:17 +00:00
Michael Niedermayer 4a3b5fe16a move syncpoint cache related stuff to common file
Originally committed as revision 10038 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 23:24:02 +00:00
Michael Niedermayer f13ea4e00c move lsb2full to common file
Originally committed as revision 10025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 18:37:28 +00:00
Michael Niedermayer 5c2198b184 move crc wrapper to slightly better spot
Originally committed as revision 10022 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 16:46:48 +00:00
Michael Niedermayer 874abace12 move syncpoint timestamp resetting code to a common file
Originally committed as revision 10020 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 16:29:30 +00:00
Michael Niedermayer 8d9a3f7e21 use a dynamic ByteIOContext instead of using the lavf buffer
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
2007-08-09 12:38:24 +00:00
Michael Niedermayer efd8f22a16 make StreamContext.time_base a pointer
Originally committed as revision 10010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 11:04:43 +00:00
Michael Niedermayer 4d75168f17 variables needed for muxer
Originally committed as revision 10009 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 10:57:10 +00:00
Diego Biurrun e5a389a1b7 license header consistency cosmetics
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05 10:40:25 +00:00
Diego Biurrun bbd861796e Add missing comment markers to #endif directive.
Originally committed as revision 9455 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-02 10:10:53 +00:00
Guillaume Poirier efb775777f add a comment to indicate which #endif belong to which #define
Originally committed as revision 9356 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-17 18:59:28 +00:00
Måns Rullgård 699b3f99d0 add multiple inclusion guards to headers
Originally committed as revision 9345 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-17 00:01:30 +00:00
Diego Biurrun 755bfeabcc misc spelling fixes
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 09:29:25 +00:00
Michael Niedermayer f7c9f48dc6 10l forgot (skip non keyframes after seeking between syncpoint and the first keyframe)
Originally committed as revision 7103 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-16 12:27:43 +00:00
Michael Niedermayer 4d5be986f0 index less seeking in O(log n) time
Originally committed as revision 7056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 13:19:51 +00:00
Michael Niedermayer 619d8e2e58 updating nut demuxer to latest spec
no muxing yet
no index yet
no seeking yet
libnuts crcs dont match mine (didnt investigate yet)
samplerate is stored wrong by libnut (demuxer has a workaround)
code is not clean or beautifull yet, but i thought its better to commit early before someone unneccesarily wastes his time duplicating the work
demuxer split from muxer

Originally committed as revision 6966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-11 01:35:50 +00:00