1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Commit Graph

102 Commits

Author SHA1 Message Date
Peter Ross
f55dd6c60d nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE 2011-03-26 13:24:45 +11:00
Stefano Sabatini
d588e3f59b Add support to B4BY and R4BY NUT codec tags added in NUT r672.
Originally committed as revision 23508 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-06 18:29:42 +00:00
Michael Niedermayer
63455b8c7e bgr/rgb444 for nut
Originally committed as revision 23504 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-06 11:43:53 +00:00
Stefano Sabatini
ab8f600902 Add support for the newly added Nut codec tags (added in Nut r669):
Y1[00][16], [16][00]1Y, Y3[11][16], [16][11]3Y, Y3[10][16],
[16][10]3Y, Y3[00][16], [16][00]3Y, Y4[11][ 8], Y2[00][ 8].

Originally committed as revision 23342 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-26 22:26:19 +00: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
Francesco Lavra
80b39e1ca6 Move AVCodecTag from riff.h into internal.h.
Patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 23250 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-22 16:01:32 +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
59856b9891 Fix warning:
libavformat/nut.c: In function ‘ff_nut_free_sp’:
libavformat/nut.c:80: warning: passing argument 4 of ‘av_tree_enumerate’ from incompatible pointer type
./libavutil/tree.h:92: note: expected ‘int (*)(void *, void *)’ but argument is of type ‘void (*)(void *, void *)’

Originally committed as revision 22659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-24 19:58:12 +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
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
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
Oded Shimon
103d74ea5c ff_nut_reset_ts() expected to get 'ts*time_base_count', but muxer only
gave it 'ts'. Fixed by changing ff_nut_reset_ts() and demuxer params

Originally committed as revision 11851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 10:27:32 +00:00
Michael Niedermayer
6e8b982bcc Move *malloc() out of tree.c, that way the code can be used with
flat arrays which have lower overhead than millions of mallocd() elements.

Originally committed as revision 11399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-04 17:52:16 +00:00
Diego Biurrun
47a1ae1bc9 Add some parentheses to clarify operator precedence, fixes the warnings:
nut.c: In function 'ff_nut_sp_pos_cmp':
nut.c:43: warning: suggest parentheses around + or - inside shift
nut.c:43: warning: suggest parentheses around + or - inside shift
nut.c: In function 'ff_nut_sp_pts_cmp':
nut.c:47: warning: suggest parentheses around + or - inside shift
nut.c:47: warning: suggest parentheses around + or - inside shift

Originally committed as revision 10926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-04 22:51:49 +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
Carl Eugen Hoyos
e56397800e Ensure av_tree_insert() is defined before using it.
Patch by Carl Eugen Hoyos   cehoyos _at_ ag.or.at

Originally committed as revision 10083 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-11 23:58:10 +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
44f46a698e remove old unused nut (de)muxer
Originally committed as revision 10018 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 16:15:50 +00:00
Panagiotis Issaris
769e10f068 Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).
Originally committed as revision 9759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-19 15:21:30 +00:00
Diego Biurrun
a7738a044d URL update, move comment to a better place.
Originally committed as revision 9476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05 09:06:27 +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
Diego Biurrun
6ebe07fbb5 variable renaming: mp3lame --> libmp3lame
Originally committed as revision 7417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-07 00:02:15 +00:00
Steve L'Homme
949b1a13bf Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
patch by Steve Lhomme, slhomme divxcorp com

Originally committed as revision 6868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 22:39:58 +00:00
Diego Biurrun
3d1eed611b Fix license header error notice by Steve LHomme.
Originally committed as revision 6730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-18 13:15:27 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Måns Rullgård
0e176c3eb5 remove redundant declarations
Originally committed as revision 6153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-02 23:10:28 +00:00
Michael Niedermayer
ccb159940b fix regression failure after adler simplification
Originally committed as revision 5803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-20 10:22:07 +00:00
Måns Rullgård
b9a73d8d2f move adler32 to libavutil
Originally committed as revision 5731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-13 21:29:01 +00:00
Måns Rullgård
9d9f4119bd move common stuff from avienc.c and wav.c to new file riff.c
Originally committed as revision 5720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-12 00:09:34 +00:00
Måns Rullgård
ff70e60176 allow individual selection of muxers and demuxers
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-10 21:14:37 +00:00
Måns Rullgård
d2a067d1d9 give AVInput/OutputFormat structs consistent names
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-09 23:40:53 +00:00
Stefan Huehner
ea138e978a Remove unused variable, patch by Stefan Huehner stefan__at__huehner__dot__org.
Originally committed as revision 5506 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-20 22:19:11 +00:00
Måns Rullgård
a5e9102b4b free codec extradata in av_close_input_file
Originally committed as revision 5484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-16 07:54:37 +00:00
Oded Shimon
9d4461b9f2 Disable lavf NUT until it is synced to spec
Originally committed as revision 5312 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-23 13:47:13 +00:00
Michael Niedermayer
30a43f2d09 add size to AVIndex
Originally committed as revision 5083 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-01 11:29:55 +00:00
Gildas Bazin
6d276a9e91 Properly #ifdef muxer-specific parts.
Taken from a patch by Gildas Bazin < gbazin -- @@ -- altern -- . -- org >

Originally committed as revision 4869 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-19 22:30:37 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address.
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-22 01:10:11 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Måns Rullgård
4733abcbf3 use PRIxN, %zd, %td formats where needed
Originally committed as revision 4740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-12 01:56:46 +00:00
Diego Biurrun
a9e3509529 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
in libavformat to allow building (de)coders and (de)muxers independently at
some point + support for this option in configure.

Originally committed as revision 4611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-23 00:25:41 +00:00
Michael Niedermayer
a26e1d4c1f checksum doesnt cover the forward_ptr anymore
Originally committed as revision 4579 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-11 08:32:25 +00:00
Michael Niedermayer
177e5460b9 forward_ptr doesnt contain its own length anymore
Originally committed as revision 4578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-11 08:28:03 +00:00
Michael Niedermayer
01f4895c68 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
Originally committed as revision 4453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-17 22:24:36 +00:00