summaryrefslogtreecommitdiff
path: root/libavformat/nut.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (40 commits) H.264: template left MB handling H.264: faster fill_decode_caches H.264: faster write_back_* H.264: faster fill_filter_caches H.264: make filter_mb_fast support the case of unavailable top mb Do not include log.h in avutil.h Do not include pixfmt.h in avutil.h Do not include rational.h in avutil.h Do not include mathematics.h in avutil.h Do not include intfloat_readwrite.h in avutil.h Remove return statements following infinite loops without break RTSP: Doxygen comment cleanup doxygen: Escape '\' in Doxygen documentation. md5: cosmetics md5: use AV_WL32 to write result md5: add fate test md5: include correct headers md5: fix test program doxygen: Drop array size declarations from Doxygen parameter names. doxygen: Fix parameter names to match the function prototypes. ... Conflicts: libavcodec/x86/dsputil_mmx.c libavformat/flvenc.c libavformat/oggenc.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Do not include mathematics.h in avutil.hMans Rullgard2011-07-03
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BEPeter Ross2011-04-28
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BEPeter Ross2011-03-26
|/
* Add support to B4BY and R4BY NUT codec tags added in NUT r672.Stefano Sabatini2010-06-06
| | | | Originally committed as revision 23508 to svn://svn.ffmpeg.org/ffmpeg/trunk
* bgr/rgb444 for nutMichael Niedermayer2010-06-06
| | | | Originally committed as revision 23504 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add support for the newly added Nut codec tags (added in Nut r669):Stefano Sabatini2010-05-26
| | | | | | | 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
* 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
* Move AVCodecTag from riff.h into internal.h.Francesco Lavra2010-05-22
| | | | | | Patch by Francesco Lavra, francescolavra interfree it Originally committed as revision 23250 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
* Fix warning:Vitor Sessak2010-03-24
| | | | | | | | 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
* 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 _t for POSIX compatibility.Michael Niedermayer2008-12-11
| | | | Originally committed as revision 16057 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
* ff_nut_reset_ts() expected to get 'ts*time_base_count', but muxer onlyOded Shimon2008-02-04
| | | | | | 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
* Move *malloc() out of tree.c, that way the code can be used withMichael Niedermayer2008-01-04
| | | | | | flat arrays which have lower overhead than millions of mallocd() elements. Originally committed as revision 11399 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add some parentheses to clarify operator precedence, fixes the warnings:Diego Biurrun2007-11-04
| | | | | | | | | | | 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
* 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
* Ensure av_tree_insert() is defined before using it.Carl Eugen Hoyos2007-08-11
| | | | | | Patch by Carl Eugen Hoyos cehoyos _at_ ag.or.at Originally committed as revision 10083 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
* remove old unused nut (de)muxerMichael Niedermayer2007-08-09
| | | | Originally committed as revision 10018 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).Panagiotis Issaris2007-07-19
| | | | Originally committed as revision 9759 to svn://svn.ffmpeg.org/ffmpeg/trunk
* URL update, move comment to a better place.Diego Biurrun2007-07-05
| | | | Originally committed as revision 9476 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
* variable renaming: mp3lame --> libmp3lameDiego Biurrun2007-01-07
| | | | Originally committed as revision 7417 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.Steve L'Homme2006-11-01
| | | | | | patch by Steve Lhomme, slhomme divxcorp com Originally committed as revision 6868 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix license header error notice by Steve LHomme.Diego Biurrun2006-10-18
| | | | Originally committed as revision 6730 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change license headers to say 'FFmpeg' instead of 'this program/this library'Diego Biurrun2006-10-07
| | | | | | and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove redundant declarationsMåns Rullgård2006-09-02
| | | | Originally committed as revision 6153 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix regression failure after adler simplificationMichael Niedermayer2006-07-20
| | | | Originally committed as revision 5803 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move adler32 to libavutilMåns Rullgård2006-07-13
| | | | Originally committed as revision 5731 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move common stuff from avienc.c and wav.c to new file riff.cMåns Rullgård2006-07-12
| | | | Originally committed as revision 5720 to svn://svn.ffmpeg.org/ffmpeg/trunk
* allow individual selection of muxers and demuxersMåns Rullgård2006-07-10
| | | | Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
* give AVInput/OutputFormat structs consistent namesMåns Rullgård2006-07-09
| | | | Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unused variable, patch by Stefan Huehner stefan__at__huehner__dot__org.Stefan Huehner2006-06-20
| | | | Originally committed as revision 5506 to svn://svn.ffmpeg.org/ffmpeg/trunk
* free codec extradata in av_close_input_fileMåns Rullgård2006-06-16
| | | | Originally committed as revision 5484 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Disable lavf NUT until it is synced to specOded Shimon2006-04-23
| | | | Originally committed as revision 5312 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add size to AVIndexMichael Niedermayer2006-03-01
| | | | Originally committed as revision 5083 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Properly #ifdef muxer-specific parts.Gildas Bazin2006-01-19
| | | | | | Taken from a patch by Gildas Bazin < gbazin -- @@ -- altern -- . -- org > Originally committed as revision 4869 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Update licensing information: The FSF changed postal address.Diego Biurrun2006-01-12
| | | | Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
* COSMETICS: tabs --> spaces, some prettyprintingDiego Biurrun2005-12-22
| | | | Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
* COSMETICS: Remove all trailing whitespace.Diego Biurrun2005-12-17
| | | | Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use PRIxN, %zd, %td formats where neededMåns Rullgård2005-12-12
| | | | Originally committed as revision 4740 to svn://svn.ffmpeg.org/ffmpeg/trunk