summaryrefslogtreecommitdiffstats
path: root/libavformat/id3v2enc.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '9279826008b80daad7446950a821f32033ccd33f'Michael Niedermayer2014-07-041-1/+1
|\ | | | | | | | | | | | | * commit '9279826008b80daad7446950a821f32033ccd33f': id3v2enc: use a case-insensitive comparison for APIC picture type Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * id3v2enc: use a case-insensitive comparison for APIC picture typeAnton Khirnov2014-07-031-1/+2
| |
* | lavf/id3v2enc: update comment about minimum paddingJames Darnley2014-01-241-4/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/id3v2enc: use metadata_header_paddingJames Darnley2014-01-241-6/+13
| | | | | | | | | | | | | | As with the change to flacenc this allows the user to control the amount of padding they want added to the file. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/id3v2enc: use UTF-16 in id3v2.3 APIC frame only if non-ASCIIMark Harris2013-08-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the encoding of picture descriptions consistent with the encoding of other text id3 tags and works better with iTunes, which does not display pictures with some UTF-16 picture descriptions (including a UTF-16 empty string, i.e. BOM + terminator). It also saves a few bytes. Example: ffmpeg -f lavfi -i sine=b=4 -f lavfi -i smptebars -map 0:a -map 1:v \ -codec:a libmp3lame -codec:v mjpeg -id3v2_version 3 \ -metadata:s:v comment="Cover (front)" -t 3 -y out.mp3 This example does not set a picture description (-metadata:s:v title=) so an empty string is written in the id3v2.3 APIC frame. Without this patch, UTF-16 is used and the cover art does not display in iTunes. With the patch the cover art is displayed. (Note that iTunes does not display or have a way to set picture descriptions, only the picture itself, but nevertheless has trouble skipping some UTF-16 descriptions.) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/id3v2enc: fix cover art display on some softwareMatthieu Bouron2013-05-301-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding an arbitrary amount of padding bytes at the end of the ID3 metadata fixes cover art display for some software (iTunes, Traktor, Serato, Torq). For reference (ID3 metadata): [ Apic frames ] -> cover doesn't show up [ Apic frames, Padding ] -> ok [ Apic frames, ID3 frames ] -> ok [ ID3 frames, Apic frames ] -> cover doesn't show up [ ID3 frames, Apic frames, Padding ] -> ok
* | id3v2enc: chapter supportPaul B Mahol2013-05-171-13/+69
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-071-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-011-47/+145
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (58 commits) amrnbdec: check frame size before decoding. cscd: use negative error values to indicate decode_init() failures. h264: prevent overreads in intra PCM decoding. FATE: do not decode audio in the nuv test. dxa: set audio stream time base using the sample rate psx-str: do not allow seeking by bytes asfdec: Do not set AVCodecContext.frame_size vqf: set packet parameters after av_new_packet() mpegaudiodec: use DSPUtil.butterflies_float(). FATE: add mp3 test for sample that exhibited false overreads fate: add cdxl test for bit line plane arrangement vmnc: return error on decode_init() failure. libvorbis: add/update error messages libvorbis: use AVFifoBuffer for output packet buffer libvorbis: remove unneeded e_o_s check libvorbis: check return values for functions that can return errors libvorbis: use float input instead of s16 libvorbis: do not flush libvorbis analysis if dsp state was not initialized libvorbis: use VBR by default, with default quality of 3 libvorbis: fix use of minrate/maxrate AVOptions ... Conflicts: Changelog doc/APIchanges libavcodec/avcodec.h libavcodec/dpxenc.c libavcodec/libvorbis.c libavcodec/vmnc.c libavformat/asfdec.c libavformat/id3v2enc.c libavformat/internal.h libavformat/mp3enc.c libavformat/utils.c libavformat/version.h libswscale/utils.c tests/fate/video.mak tests/ref/fate/nuv tests/ref/fate/prores-alpha tests/ref/lavf/ffm tests/ref/vsynth1/prores tests/ref/vsynth2/prores Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * id3v2enc: add a function for writing attached pictures.Anton Khirnov2012-02-291-9/+82
| | | | | | | | Unused so far.
| * id3v2enc: fix writing frame sizes for ID3v2.3Anton Khirnov2012-02-291-11/+15
| | | | | | | | | | | | | | Frame sizes in ID3v2.3 are not synchsafe, they are simply 32be numbers. In practice this bug is not noticeable unless the frame size takes more than 7 bits (which is almost never for text frames).
| * id3v2enc: split ff_id3v2_write().Anton Khirnov2012-02-291-22/+42
| | | | | | | | | | This will allow writing the tag in several steps, needed for writing attached pictures.
| * id3v2enc: make id3v2_put_size take only an AVIOContext.Anton Khirnov2012-02-291-7/+7
| | | | | | | | It has no need of full AVFormatContext.
* | id3v2enc: av_strcasecmp()Michael Niedermayer2011-11-031-2/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | id3v2enc: include strings.h for strcasecmp()Michael Niedermayer2011-11-021-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | id3v2enc: add support for year and day/month tags when writing id3v2 version ↵Tobias Rapp2011-11-021-1/+42
| | | | | | | | | | | | | | | | | | | | 3 metadata Adds support for year (TYER) and day/month (TDAT) tags when writing id3v2 version 3 metadata by splitting the "date" tag. The date tag should have a format of "YYYY-MM-DD" or "YYYY". Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-241-4/+4
|/ | | | | | | | | | | | | | | | | | | | | | * qatar/master: Move id3v2 tag writing to a separate file. swscale: add missing colons to x86 assembly yuv2planeX. g722: split decoder and encoder into separate files cosmetics: remove extra spaces before end-of-statement semi-colons vorbisdec: check output buffer size before writing output wavpack: calculate bpp using av_get_bytes_per_sample() ac3enc: Set max value for mode options correctly lavc: move get_b_cbp() from h263.h to mpeg4videoenc.c mpeg12: move closed_gop from MpegEncContext to Mpeg1Context mpeg12: move full_pel from MpegEncContext to Mpeg1Context mpeg12: move Mpeg1Context from mpeg12.c to mpeg12.h mpegvideo: remove some unused variables from MpegEncContext. Conflicts: libavcodec/mpeg12.c libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Move id3v2 tag writing to a separate file.Michael Karcher2011-10-231-0/+146
Signed-off-by: Diego Biurrun <diego@biurrun.de>
OpenPOWER on IntegriCloud