1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavformat
Anton Khirnov 7fd5aeb3e5 Only read ID3v1 tag if ID3v2 isn't present or is empty.
This prevents the demuxer from exporting multiple semantically identical but
differently named tags.

Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 20175 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-05 21:36:56 +00:00
..
4xm.c
adtsenc.c Use av_log_missing_feature in the ADTS encoder. (Pseudo reverts r19173). 2009-06-29 22:48:07 +00:00
aea.c Add condition to aea demuxer probe. 2009-09-13 18:27:53 +00:00
aiff.c Return special EOF checking for aiff and au demuxers, the check was at 2009-10-02 06:42:20 +00:00
allformats.c Hook up the MD studio demuxer and Atrac1 decoder. 2009-09-22 17:28:03 +00:00
amr.c
apc.c
ape.c Move APE tag parsing into separate module. 2009-08-11 17:08:09 +00:00
apetag.c Move APE tag parsing into separate module. 2009-08-11 17:08:09 +00:00
apetag.h Move APE tag parsing into separate module. 2009-08-11 17:08:09 +00:00
asf.c Per-stream language-tags extraction in asfdec. 2009-05-12 12:35:46 +00:00
asf.h Remove any reference to ASFContext.packet_size and replace it with 2009-06-24 23:04:05 +00:00
asfcrypt.c
asfcrypt.h
asfdec.c Fix incorrect display of ASF/WMV duration after r12926. 2009-08-30 18:14:22 +00:00
asfenc.c Remove any reference to ASFContext.packet_size and replace it with 2009-06-24 23:04:05 +00:00
assdec.c Silence "assdec.c:146: warning: passing argument 4 of ‘qsort’ from incompatible pointer type" 2009-02-14 15:44:46 +00:00
assenc.c
au.c Return special EOF checking for aiff and au demuxers, the check was at 2009-10-02 06:42:20 +00:00
audiointerleave.c Reorder arguments for av_fifo_generic_read to be more logical and 2009-03-09 17:47:47 +00:00
audiointerleave.h Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues. 2009-03-08 14:16:55 +00:00
avc.c cosmetics, remove spaces after '(' and before ')' 2009-07-30 19:14:57 +00:00
avc.h
avformat.h Fix reading VDR files (broken since r19000). 2009-09-24 19:20:53 +00:00
avi.h
avidec.c Fix playback of strange AVI files with stray LIST. 2009-10-01 10:24:02 +00:00
avienc.c Add ff_ prefixes to exported symbols in libavformat/riff.h. 2009-06-22 23:09:34 +00:00
avio.c Move function for reading whole specified amount of data from RTSP 2009-06-04 06:25:53 +00:00
avio.h Move function for reading whole specified amount of data from RTSP 2009-06-04 06:25:53 +00:00
aviobuf.c Make get_buffer and get_partial_buffer return url_ferror or AVERROR_EOF as 2009-10-02 06:36:39 +00:00
avisynth.c Add ff_ prefixes to exported symbols in libavformat/riff.h. 2009-06-22 23:09:34 +00:00
avlanguage.c 100l, all avlanguage tables should be both static and const. 2009-09-06 08:36:25 +00:00
avlanguage.h Convert names to the FFmpeg style. 2009-04-28 19:51:50 +00:00
avs.c
bethsoftvid.c
bfi.c
c93.c Check the index validity more thoroughly for the c93 probe function. 2009-09-14 20:01:32 +00:00
caf.c Core Audio Format demuxer 2009-09-16 12:26:59 +00:00
caf.h #include correct header to fix 'make checkheaders'. 2009-09-18 19:51:05 +00:00
cafdec.c Core Audio Format demuxer 2009-09-16 12:26:59 +00:00
crcenc.c
cutils.c
daud.c
dsicin.c
dv.c Extend DV autodetection to also reliably detect single-frame DVs with 2009-09-29 10:12:18 +00:00
dv.h
dvenc.c Allocate AVFifoBuffer through the fifo API to reduce future API/ABI issues. 2009-03-08 14:16:55 +00:00
dxa.c Improve dxa probe by checking the values for width and height are reasonable. 2009-09-17 18:08:07 +00:00
eacdata.c
electronicarts.c Slightly improve probe for ea format by checking that it is possible to 2009-09-17 18:07:27 +00:00
ffm.h
ffmdec.c remove useless duplication of what av_new_stream() already does 2009-04-10 12:49:53 +00:00
ffmenc.c do not write ffm write index by default, detect if file is being written and return EOF 2009-03-20 01:23:33 +00:00
file.c Only consider -1 as an error return value for open(). 2009-07-27 12:36:22 +00:00
flacdec.c Add a VorbisComment metadata conversion table and use it in the FLAC and 2009-06-13 22:45:58 +00:00
flacenc.c Share the function to write a raw FLAC header and use it in the Matroska 2009-02-26 02:41:53 +00:00
flacenc.h Share the function to write a raw FLAC header and use it in the Matroska 2009-02-26 02:41:53 +00:00
flic.c
flv.h Register some additional AMF types in libavformat/flv.h 2009-07-21 07:18:14 +00:00
flvdec.c Check offset in flv_probe() 2009-09-15 14:56:09 +00:00
flvenc.c Flv should be AVFMT_VARIABLE_FPS. 2009-09-16 01:49:34 +00:00
framecrcenc.c
gif.c Rename pbBufPtr() to put_bits_ptr(). 2009-04-13 16:59:38 +00:00
gopher.c
gxf.c
gxf.h
gxfenc.c Add ff_ prefixes to exported symbols in libavformat/riff.h. 2009-06-22 23:09:34 +00:00
http.c Add support for "chunked" data blocks. Patch by Peter Holik (peter holik at). 2009-06-23 15:38:53 +00:00
id3v1.c ff_id3v1_genre_str table should be const. 2009-09-06 08:39:41 +00:00
id3v1.h ff_id3v1_genre_str table should be const. 2009-09-06 08:39:41 +00:00
id3v2.c id3v2: Export all text information frames with correct names. 2009-10-05 20:10:07 +00:00
id3v2.h MP3 muxer: Write all metadata. 2009-10-05 16:06:00 +00:00
idcin.c Check buffer size for idcin check, otherwise false positives are too likely for 2009-09-14 15:44:05 +00:00
idroq.c Simplify RoQ demuxer pts calculation by using a appropriate time bases. 2009-03-13 13:37:35 +00:00
iff.c
img2.c return EOF in image2 demuxer 2009-07-30 08:21:11 +00:00
internal.h
ipmovie.c Search for ipmovie signature beyond the start of the file. 2009-09-05 15:41:32 +00:00
isom.c Add '.mp1' for MP1 audio in MOV/CAF. 2009-06-17 00:37:06 +00:00
isom.h Make mov LPCM and AAC parsing functions public 2009-09-16 11:35:01 +00:00
iss.c
libnut.c Add ff_ prefixes to exported symbols in libavformat/riff.h. 2009-06-22 23:09:34 +00:00
lmlm4.c
Makefile Hook up the MD studio demuxer and Atrac1 decoder. 2009-09-22 17:28:03 +00:00
matroska.c matroska: add support for MLP and TRUEHD codec tags 2009-03-30 21:37:04 +00:00
matroska.h Add some basic metadata conversion tables for matroska and asf. 2009-03-01 00:12:08 +00:00
matroskadec.c matroskadec: cosmetics: indentation 2009-10-01 21:15:36 +00:00
matroskaenc.c Add ff_ prefixes to exported symbols in libavformat/riff.h. 2009-06-22 23:09:34 +00:00
metadata_compat.c don't trigger metadata compatibility code when user app already set metadata 2009-02-26 13:00:13 +00:00
metadata.c simplify metadata conversion and fixes gcc-2.95 at the same time 2009-03-01 14:29:30 +00:00
metadata.h add a metadata conversion API 2009-02-28 23:34:16 +00:00
mm.c Vastly improved mm_probe function, passes probetest. 2009-09-15 09:21:29 +00:00
mmf.c Add ff_ prefixes to exported symbols in libavformat/riff.h. 2009-06-22 23:09:34 +00:00
mov.c 10l in code reading codec_name, the first byte is the length and should not 2009-09-30 18:27:39 +00:00
movenc.c Add ff_ prefixes to exported symbols in libavformat/riff.h. 2009-06-22 23:09:34 +00:00
mp3.c Only read ID3v1 tag if ID3v2 isn't present or is empty. 2009-10-05 21:36:56 +00:00
mpc8.c Return an error when the parsed mpc chunk size is negative, otherwise we 2009-09-30 13:35:13 +00:00
mpc.c Parse ID3 tags in Musepack SV7 files 2009-08-11 17:28:56 +00:00
mpeg.c Make mpeg_probe() pass probetest. 2009-09-15 12:20:03 +00:00
mpeg.h
mpegenc.c put_bits can only reliably write up to 31 bit bits, above it relies on 2009-10-01 15:40:29 +00:00
mpegts.c Allow the combined TrueHD/AC3 tracks on Blu-Ray discs to be demuxed as two separate streams. 2009-10-05 08:38:39 +00:00
mpegts.h mpegts: change variable-length array to fixed length 2009-08-24 21:42:25 +00:00
mpegtsenc.c fix pes overhead computation, patch by Niobos, niobos at dest-unreach dot be 2009-09-17 19:07:09 +00:00
mpjpeg.c
msnwc_tcp.c
mtv.c Mark video from .mtv files correctly as upside-down. 2009-08-25 07:47:34 +00:00
mvi.c
mxf.c
mxf.h
mxfdec.c return AVERROR_EOF 2009-05-30 06:16:44 +00:00
mxfenc.c Improve amortized worst case speed of the muxers packet interleaving code 2009-09-16 20:04:04 +00:00
ncdec.c Do not return values above AVPROBE_SCORE_MAX from probe(). 2009-09-15 13:28:14 +00:00
network.h
nsvdec.c Add ff_ prefixes to exported symbols in libavformat/riff.h. 2009-06-22 23:09:34 +00:00
nut.c
nut.h
nutdec.c Add ff_ prefixes to exported symbols in libavformat/riff.h. 2009-06-22 23:09:34 +00:00
nutenc.c Add ff_ prefixes to exported symbols in libavformat/riff.h. 2009-06-22 23:09:34 +00:00
nuv.c Add ff_ prefixes to exported symbols in libavformat/riff.h. 2009-06-22 23:09:34 +00:00
oggdec.c Disable parsing for ogg streams where no ogg header was found, 2009-09-30 09:46:48 +00:00
oggdec.h Add a VorbisComment metadata conversion table and use it in the FLAC and 2009-06-13 22:45:58 +00:00
oggenc.c Improve amortized worst case speed of the muxers packet interleaving code 2009-09-16 20:04:04 +00:00
oggparseflac.c Rename bitstream.h to get_bits.h. 2009-04-13 16:20:26 +00:00
oggparseogm.c Add ff_ prefixes to exported symbols in libavformat/riff.h. 2009-06-22 23:09:34 +00:00
oggparsespeex.c Modify the Ogg/Speex demuxer and the libspeex decoder so that they always treat 2009-08-28 00:44:54 +00:00
oggparsetheora.c Replace invalid Theora frame rate by 25 FPS. 2009-07-03 11:31:09 +00:00
oggparsevorbis.c Fix possible buffer over-read in vorbis_comment, fix it double to be sure. 2009-09-24 15:37:09 +00:00
oma.c Add ff_ prefixes to exported symbols in libavformat/riff.h. 2009-06-22 23:09:34 +00:00
options.c use AVFormatContext->probesize in av_find_stream_info and raise default to 5M 2009-06-25 19:10:27 +00:00
os_support.c
os_support.h Only #define lseek to _lseeki64 on MinGW, not MinGW CE. 2009-07-13 17:16:36 +00:00
output-example.c Use enums instead of int. 2009-08-02 17:42:40 +00:00
psxstr.c
pva.c technically mp2 in pva needs AVSTREAM_PARSE_FULL 2009-05-27 06:58:22 +00:00
qcp.c Add QCP demuxer. 2009-05-20 17:19:39 +00:00
qtpalette.h Remove alpha channel from default colorspace tables, since it is unused. See 2009-03-22 13:05:13 +00:00
r3d.c return AVERROR(ENOMEM) if stream could not be allocated 2009-08-25 19:59:38 +00:00
raw.c Fix pcm_read_seek () when the position it calculates is greater than 2 GB. 2009-10-05 09:19:42 +00:00
raw.h Separate the raw FLAC demuxer from raw.c and put in a new file, 2009-02-28 17:24:46 +00:00
rdt.c Don't use a pointer-to-flags/timestamp in ff_rm_parse_packet(); the function 2009-07-30 15:04:19 +00:00
rdt.h
riff.c fix riff subtitle timebase 2009-08-07 23:57:52 +00:00
riff.h Add ff_ prefixes to exported symbols in libavformat/riff.h. 2009-06-22 23:09:34 +00:00
rl2.c
rm.c ff_rm_metadata is const. 2009-09-06 08:57:19 +00:00
rm.h ff_rm_metadata is const. 2009-09-06 08:57:19 +00:00
rmdec.c When resetting vst->pkt.data to NULL, also set vst->slices. 2009-09-13 11:08:59 +00:00
rmenc.c Remove index writing in RM muxer, since it is broken (multiple streams per 2009-03-21 20:34:24 +00:00
rpl.c cosmetics: vertical alignment 2009-02-26 22:39:53 +00:00
rtmp.h RTMP protocol support (as a client) 2009-07-31 06:49:36 +00:00
rtmppkt.c RTMP protocol support (as a client) 2009-07-31 06:49:36 +00:00
rtmppkt.h RTMP protocol support (as a client) 2009-07-31 06:49:36 +00:00
rtmpproto.c Do not include "mp4:" prefix from RTMP URL into "app" path or second time 2009-09-17 05:31:02 +00:00
rtp_aac.c Correctly set the "AU size" field in the payload header for 2009-05-29 13:46:46 +00:00
rtp_amr.c Add support for AMR audio in the RTP muxer 2009-04-08 07:16:14 +00:00
rtp_asf.c Cosmetics: remove spaces between function name and arguments in declaration, 2009-07-27 14:32:54 +00:00
rtp_asf.h Assign the x-pf-asf payload string to be decoded by rtp_asf.c, and add a 2009-03-20 01:11:08 +00:00
rtp_h263.c Fix the copyright year 2009-04-07 12:28:41 +00:00
rtp_h264.c Use named initializers and use new/free_context() instead of extradata() 2009-07-27 14:29:06 +00:00
rtp_h264.h
rtp_mpv.c Make sure buffer end remains constant within the loop 2009-06-10 14:56:50 +00:00
rtp_vorbis.c Use named initializers and use new/free_context() instead of extradata() 2009-07-27 14:29:06 +00:00
rtp_vorbis.h Add a Vorbis payload parser. Implemented by Colin McQuillan as a GSoC 2009-04-14 15:01:46 +00:00
rtp.c Rename bitstream.h to get_bits.h. 2009-04-13 16:20:26 +00:00
rtp.h Document ff_rtp_codec_id() 2009-02-28 19:34:50 +00:00
rtpdec.c Add a Vorbis payload parser. Implemented by Colin McQuillan as a GSoC 2009-04-14 15:01:46 +00:00
rtpdec.h Add url_get_file_handle(), which is used to get the file descriptor 2009-03-03 17:04:51 +00:00
rtpenc_h264.c Fix the M bit for multi-packet NALs. 2009-05-16 17:11:47 +00:00
rtpenc.c Rename bitstream.h to get_bits.h. 2009-04-13 16:20:26 +00:00
rtpenc.h Add support for AMR audio in the RTP muxer 2009-04-08 07:16:14 +00:00
rtpproto.c Add url_get_file_handle(), which is used to get the file descriptor 2009-03-03 17:04:51 +00:00
rtsp.c Unscrewup indentation (pointed out by Diego). 2009-09-18 13:18:47 +00:00
rtsp.h RTSP basic authentication, patch originally by Philip Coombes 2009-09-17 21:47:11 +00:00
rtspcodes.h
sdp.c Add support for AMR audio in the RTP muxer 2009-04-08 07:16:14 +00:00
seek.c Use I/O buffer size as initial value for backoff for seeking sync point search. 2009-09-13 08:57:30 +00:00
seek.h cosmetic changes (indentation, doxygen comments, braces, put structures for API to header, ...) 2009-09-05 19:31:01 +00:00
segafilm.c
sierravmd.c Fix overflow check insufficiently improved in r19840. 2009-09-16 15:12:23 +00:00
siff.c Improve SIFF probe by also checking the first tag is one of the expected. 2009-09-17 18:09:20 +00:00
smacker.c Make Smacker audio decoder output audio in original bit depth 2009-03-21 15:52:14 +00:00
sol.c
sox.h Implement SoX native format muxer and demuxer. 2009-05-30 18:51:15 +00:00
soxdec.c Add block_align to sox input. 2009-07-08 08:52:56 +00:00
soxenc.c Implement SoX native format muxer and demuxer. 2009-05-30 18:51:15 +00:00
spdif.c Add support for S/PDIF encapsulation. 2009-08-21 08:34:19 +00:00
swf.h remove unused fields in swf context 2009-03-14 22:49:01 +00:00
swfdec.c Add ff_ prefixes to exported symbols in libavformat/riff.h. 2009-06-22 23:09:34 +00:00
swfenc.c Add ff_ prefixes to exported symbols in libavformat/riff.h. 2009-06-22 23:09:34 +00:00
tcp.c Use ff_neterrno instead of errno in tcp.c. 2009-07-15 05:52:49 +00:00
thp.c
tiertexseq.c
timefilter.c Replace rand() usage by av_lfg_get(). 2009-04-10 17:12:36 +00:00
timefilter.h Add my name to copyright & author as requested by the original author. 2009-03-06 20:51:50 +00:00
tmv.c Add 8088flex TMV file demuxer. 2009-05-06 22:01:54 +00:00
tta.c Rename bitstream.h to get_bits.h. 2009-04-13 16:20:26 +00:00
txd.c Add a context to av_log() calls. 2009-03-03 16:19:37 +00:00
udp.c Add url_get_file_handle(), which is used to get the file descriptor 2009-03-03 17:04:51 +00:00
utils.c Add FIXME about low_delay vs has_b_frames. 2009-10-03 19:40:52 +00:00
vc1test.c Do not set 0 FPS in VC-1 test stream format demuxer. 2009-09-15 16:36:53 +00:00
vc1testenc.c
voc.c
voc.h
vocdec.c Add ff_ prefixes to exported symbols in libavformat/riff.h. 2009-06-22 23:09:34 +00:00
vocenc.c
vqf.c VQF demuxer 2009-03-07 22:42:09 +00:00
wav.c wav demuxer: return AVERROR_EOF instead of AVERROR(EIO) when the end of 2009-10-02 07:27:08 +00:00
wc3movie.c Slightly improve/correct description of wc3_pal_lookup 2009-04-12 08:49:20 +00:00
westwood.c Remove unused code from Westwood VQA/AUD demuxer. 2009-04-16 12:39:14 +00:00
wv.c Add floating point audio decoding to WavPack decoder. 2009-05-06 05:40:43 +00:00
xa.c Add more sanity checks for header elements, rejecting files with clearly 2009-09-14 19:58:51 +00:00
yuv4mpeg.c Use chroma_sample_location in reading/writing yuv4mpeg 2009-05-11 04:35:15 +00:00