summaryrefslogtreecommitdiffstats
path: root/libavformat/metadata.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-291-1/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: aacenc: Fix LONG_START windowing. aacenc: Fix a bug where deinterleaved samples were stored in the wrong place. avplay: use the correct array size for stride. lavc: extend doxy for avcodec_alloc_context3(). APIchanges: mention avcodec_alloc_context()/2/3 avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS. aacsbr: ARM NEON optimised sbrdsp functions aacsbr: align some arrays aacsbr: move some simdable loops to function pointers cosmetics: Remove extra newlines at EOF Conflicts: libavcodec/utils.c libavfilter/formats.c libavutil/mem.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Remove extra newlines at EOFAlex Converse2012-01-271-1/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-281-29/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove disabled FF_API_OLD_METADATA2 cruftAnton Khirnov2012-01-271-29/+0
| |
| * Replace all usage of strcasecmp/strncasecmpReimar Döffinger2011-11-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | All current usages of it are incompatible with localization. For example strcasecmp("i", "I") != 0 is possible, but would break many of the places where it is used. Instead use our own implementations that always treat the data as ASCII. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Replace all strcasecmp/strncasecmp usages.Reimar Döffinger2011-11-031-3/+3
| | | | | | | | | | | | | | | | | | | | All current usages of it are incompatible with localization. For example strcasecmp("i", "I") != 0 is possible, but would break many of the places where it is used. Instead use our own implementations that always treat the data as ASCII. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-091-83/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: crypto: Use av_freep instead of av_free lavf: don't try to free private options if priv_data is NULL. swscale: fix types of assembly arguments. swscale: move two macros that are only used once into caller. swscale: remove unused function. options: Add missing braces around struct initializer. mov: Remove leftover crufty debug statement with references to a local file. dvbsubdec: Fix compilation of debug code. Remove all uses of now deprecated metadata functions. Move metadata API from lavf to lavu. Conflicts: doc/APIchanges libavformat/aiffdec.c libavformat/asfdec.c libavformat/avformat.h libavformat/avidec.c libavformat/cafdec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/wtv.c libavutil/avutil.h libavutil/internal.h libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move metadata API from lavf to lavu.Anton Khirnov2011-06-081-83/+20
| | | | | | | | | | | | Rename it to AVDictionary, since it will be used as such. Tags documentation and metadata conversion API is lavf-specific, so remains there.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-201-7/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (37 commits) In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. lavc: remove reference to opt.h from Makefile. prefer avio_check() over url_exist() avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols lavu: remove misc disabled cruft lavu: remove FF_API_OLD_IMAGE_NAMES cruft NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft lavc: remove misc disabled cruft. lavc: remove the FF_API_INOFFICIAL cruft. lavc: remove the FF_API_SET_STRING_OLD cruft. lavc: remove the FF_API_USE_LPC cruft. lavc: remove the FF_API_SUBTITLE_OLD cruft. lavc: remove the FF_API_VIDEO_OLD cruft. lavc: remove the FF_API_AUDIO_OLD cruft. lavc: remove the FF_API_OPT_SHOW cruft. lavc: remove the FF_API_MM_FLAGS cruft. lavf: remove misc disabled cruft. lavf: remove FF_API_INDEX_BUILT cruft lavf: remove FF_API_URL_CLASS cruft. lavf: remove FF_API_SYMVER cruft ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove FF_API_OLD_METADATA cruftAnton Khirnov2011-04-191-7/+0
| |
| * lavf: postpone removal of public metadata conversion APIAnton Khirnov2011-04-131-0/+2
| | | | | | | | It's been deprecated only a few months ago, long after 0.6.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | lavf: postpone removal of public metadata conversion APIAnton Khirnov2011-02-231-0/+2
|/ | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Introduce av_metadata_copy() to copy metadata from one struct to another.Ronald S. Bultje2011-01-141-0/+8
| | | | Originally committed as revision 26330 to svn://svn.ffmpeg.org/ffmpeg/trunk
* metadata: make av_metadata_set2 case insensitive by defaultAurelien Jacobs2010-10-181-1/+1
| | | | Originally committed as revision 25515 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add ff_ prefix to metadata_conv()Anton Khirnov2010-10-161-6/+6
| | | | | | patch by Anton Khirnov anton _at_ khirnov _dot_ net Originally committed as revision 25505 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Export metadata in the generic format. Deprecate old conversion API.Anton Khirnov2010-10-151-2/+8
| | | | | | patch by Anton Khirnov anton _at_ khirnov _dot_ net Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rename LAVF_API_* defines to FF_API_* to clarify that it is not public APIAurelien Jacobs2010-08-181-1/+1
| | | | Originally committed as revision 24825 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add LAVF_API_OLD_METADATA define to disable the deprecated metadata APIAurelien Jacobs2010-08-171-1/+1
| | | | Originally committed as revision 24818 to svn://svn.ffmpeg.org/ffmpeg/trunk
* reindent after previous commit.Anton Khirnov2010-06-041-12/+12
| | | | | | Patch by Anton Khirnov, wyskas at gmail Originally committed as revision 23467 to svn://svn.ffmpeg.org/ffmpeg/trunk
* metadata: make conversion to the same format a noop.Anton Khirnov2010-06-041-2/+3
| | | | | | Patch by Anton Khirnov, wyskas at gmail Originally committed as revision 23466 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Mark av_metadata_set() as deprecated, and use av_metadata_set2()Stefano Sabatini2010-04-251-1/+1
| | | | | | | | in its place. av_metadata_set() is going to be dropped at the next major bump. Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a flag to not overwrite existing tagsAnton Khirnov2010-04-051-0/+2
| | | | | | Patch by Anton Khirnov <wyskas gmail com>. Originally committed as revision 22806 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Set lavf identification string globally in av_write_header(), ratherAnton Khirnov2010-02-161-1/+1
| | | | | | | | | than inside the muxers. Remove special handling of "encoder" tags from AVI and MP3 muxers. Patch by Anton Khirnov <wyskas gmail com>. Originally committed as revision 21850 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add flags to prevent strdup() on arguments to av_metadata_set2().Michael Niedermayer2009-12-131-1/+14
| | | | | | | | I cannot use the same ABI as ffmbc as value 2 is already used in ffmpeg, besides the name AV_METADATA_NONCONST* makes no sense to me. Add av_metadata_set2() that takes flags. Originally committed as revision 20834 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix indentationBaptiste Coudurier2009-10-181-7/+7
| | | | Originally committed as revision 20300 to svn://svn.ffmpeg.org/ffmpeg/trunk
* simplify metadata conversion and fixes gcc-2.95 at the same timeAurelien Jacobs2009-03-011-11/+9
| | | | Originally committed as revision 17681 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add a metadata conversion APIAurelien Jacobs2009-02-281-0/+49
| | | | Originally committed as revision 17670 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix a memleak in av_metadata_set()Aurelien Jacobs2009-02-261-1/+3
| | | | Originally committed as revision 17617 to svn://svn.ffmpeg.org/ffmpeg/trunk
* modify the way to pass parameters to av_metadata_set()Aurelien Jacobs2009-02-021-6/+6
| | | | | | | This improves code readability and this avoid warnings about discarding qualifiers from pointer target type. Originally committed as revision 16952 to svn://svn.ffmpeg.org/ffmpeg/trunk
* replace AV_METADATA_IGNORE_CASE flag by a new AV_METADATA_MATCH_CASE flagAurelien Jacobs2009-01-181-3/+3
| | | | | | with the opposed meaning Originally committed as revision 16680 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move ff_metadata_sync_compat to metadata_compat.cAurelien Jacobs2009-01-081-37/+0
| | | | Originally committed as revision 16500 to svn://svn.ffmpeg.org/ffmpeg/trunk
* free all allocated metadata structuresAurelien Jacobs2009-01-061-0/+14
| | | | Originally committed as revision 16457 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ignore year=0 and track=0Aurelien Jacobs2009-01-061-1/+1
| | | | Originally committed as revision 16452 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a metadata compatibility layer, so that when a user application setAurelien Jacobs2009-01-061-0/+37
| | | | | | | metadata using old API, it is automatically converted to new API before muxing. Originally committed as revision 16447 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add a typedef for AVMetadataAurelien Jacobs2009-01-051-3/+3
| | | | Originally committed as revision 16446 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rename AVMetaData to AVMetadata and meta_data to metadataAurelien Jacobs2009-01-041-6/+6
| | | | Originally committed as revision 16430 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move metadata API from avcodec to avformat.Michael Niedermayer2009-01-041-0/+75
Originally committed as revision 16425 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud