Anton Khirnov
cb6bc57681
id3v2: split tables for various ID3v2 versions
This is needed for upcoming ID3v2.3 muxing support.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
15 years ago
Anton Khirnov
8c3caf7fb1
mp3enc: handle errors in id3v2_put_ttag
make the initialization of put clearer
this are the differences between
[FFmpeg-devel] [PATCH 1/3] mp3enc: add support for writing UTF-16 tags
and the already applied 187e23478b
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
15 years ago
Clément Bœsch
045b80e52d
Move ID3v1 skip from decoder to demuxer
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
15 years ago
Anton Khirnov
187e23478b
mp3enc: add support for writing UTF-16 tags
Also it gets rid of some mysterious magic numbers in code.
Signed-off-by: Mans Rullgard <mans@mansr.com>
15 years ago
Anton Khirnov
dccbd97d72
lavf: move ff_put_str16_nolen from asf to avio and rename it
It will be useful in the mp3 muxer.
Signed-off-by: Mans Rullgard <mans@mansr.com>
15 years ago
Anton Khirnov
4efd5cf34b
avio: add av_put_str and deprecate put_strz in favor of it
Signed-off-by: Mans Rullgard <mans@mansr.com>
15 years ago
Anton Khirnov
eeb0b893e3
id3v2: use an enum for encodings instead of magic numbers.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d66eff3685 )
15 years ago
Anton Khirnov
baa69f8a84
Split mp3 demuxer and muxer into separate files.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d08928bbea )
15 years ago
Janne Grunau
236bb68d76
mpegtsenc: prefer metadata keyed with "service_name"
title metadata is only used as fallback if no service_name is available.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit e5fe65512b )
15 years ago
Georgi Chorbadzhiyski
d7b219ca96
Set service_provider and service_name in mpegts demuxer
Set service_provider and service_name in mpegts demuxer, previously
name and provider_name were set but since the muxer uses service_provider
and service_name use them.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e8315e7881 )
15 years ago
Anton Khirnov
d4cc1f5b97
id3v2: don't overwrite existing tags
Apparently some broken taggers prepend a new ID3v2 tag leaving the
existing one intact. Our parser currently reads all tags and overwrites
existing values with supposedly outdated ones.
fixes issue2419
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 75aded8328 )
15 years ago
Anton Khirnov
189665d927
id3v2: convert metadata after all the tags were read
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f7fcd6a254 )
15 years ago
Anton Khirnov
b3158f7a42
id3v2: make ff_id3v2_parse static
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 46a2da7698 )
15 years ago
Georgi Chorbadzhiyski
7916202b97
Add service_provider and service_name metadata
This patch adds support in mpegts muxer for using service_provider and
service_name metadata to set service_provider_name and service_name
fields in SDT.
Example usage:
ffmpeg -i file.ts -f mpegts -re -acodec copy -vcodec copy -f mpegts \
-metadata service_provider="Some provider" \
-metadata service_name="Some Channel" \
"udp://239.0.70.2:5000?pkt_size=1316&ttl=1"
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 69688e71bc )
15 years ago
Anton Khirnov
50196a982b
lavf: move the version macros to a new header
Signed-off-by: Mans Rullgard <mans@mansr.com>
15 years ago
Anton Khirnov
d66eff3685
id3v2: use an enum for encodings instead of magic numbers.
Signed-off-by: Mans Rullgard <mans@mansr.com>
15 years ago
Anton Khirnov
d08928bbea
Split mp3 demuxer and muxer into separate files.
Signed-off-by: Mans Rullgard <mans@mansr.com>
15 years ago
Janne Grunau
e5fe65512b
mpegtsenc: prefer metadata keyed with "service_name"
title metadata is only used as fallback if no service_name is available.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
15 years ago
Georgi Chorbadzhiyski
e8315e7881
Set service_provider and service_name in mpegts demuxer
Set service_provider and service_name in mpegts demuxer, previously
name and provider_name were set but since the muxer uses service_provider
and service_name use them.
Signed-off-by: Mans Rullgard <mans@mansr.com>
15 years ago
Anton Khirnov
75aded8328
id3v2: don't overwrite existing tags
Apparently some broken taggers prepend a new ID3v2 tag leaving the
existing one intact. Our parser currently reads all tags and overwrites
existing values with supposedly outdated ones.
fixes issue2419
Signed-off-by: Mans Rullgard <mans@mansr.com>
15 years ago
Anton Khirnov
f7fcd6a254
id3v2: convert metadata after all the tags were read
Signed-off-by: Mans Rullgard <mans@mansr.com>
15 years ago
Anton Khirnov
46a2da7698
id3v2: make ff_id3v2_parse static
Signed-off-by: Mans Rullgard <mans@mansr.com>
15 years ago
Georgi Chorbadzhiyski
69688e71bc
Add service_provider and service_name metadata
This patch adds support in mpegts muxer for using service_provider and
service_name metadata to set service_provider_name and service_name
fields in SDT.
Example usage:
ffmpeg -i file.ts -f mpegts -re -acodec copy -vcodec copy -f mpegts \
-metadata service_provider="Some provider" \
-metadata service_name="Some Channel" \
"udp://239.0.70.2:5000?pkt_size=1316&ttl=1"
Signed-off-by: Mans Rullgard <mans@mansr.com>
15 years ago
Janne Grunau
2c3589bfda
consolidate .gitignore patters into a single file
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
15 years ago
Justin Ruggles
f61cbc22d3
Revise check for codec id in voc demuxer.
This fixes demuxing of packets that do not contain a codec tag and come before the codec_id has been set.
15 years ago
Justin Ruggles
1ae02fe03b
Fix bug in voc demuxer that was introduced in SVN r26309.
Fixes issue 2560.
15 years ago
Reimar Döffinger
54bc640362
Missing parts of IVF muxer support.
15 years ago
Reimar Döffinger
326851b9bc
Add muxer for IVF format.
15 years ago
John Wimer
b79c3df088
prevent integer overflow in calculating duration
Signed-off-by: Martin Storsjö <martin@martin.st>
15 years ago
Janne Grunau
348b8218f7
convert svn:ignore properties to .gitignore files
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
15 years ago
Michael Niedermayer
8bb7d97be0
Check 4xm headers for validity. This should avoid 1/0.
Originally committed as revision 26392 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
f9329946d0
Parse fact chunks from wav files to find duration.
Originally committed as revision 26370 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
724b1f6a05
Factor tag reading code out of wav read_header()
Originally committed as revision 26369 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
462b26202b
Set duration for wav files from sample size and data size or the wf64 sample value.
This should improve duration accuracy slightly and avoids a warning about its
inaccuracy when accurate values are available. Idea by Frank Barchard
Originally committed as revision 26366 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Baptiste Coudurier
6dc7dc08ed
In mxf muxer, check the return value of gmtime, fix #2494
Originally committed as revision 26343 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Ronald S. Bultje
06ed024d4f
Copy metadata from ASF files contained in RTSP streams from ASF to RTSP layer,
so that applications can read it also.
Originally committed as revision 26332 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Ronald S. Bultje
7f88a5bf9b
Introduce av_metadata_copy() to copy metadata from one struct to another.
Originally committed as revision 26330 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Peter Ross
b070bcfe8a
wtv: ignore VIDEOINFOHEADER2 picture aspect ratio information, as it is unreliable
Originally committed as revision 26327 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Martin Storsjö
c66f53cf8b
Revert aviobuf: Retry if the read/write function returns AVERROR(EAGAIN)
This reverts SVN commit 26318, which broke MS-RTSP playback.
Originally committed as revision 26326 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Stefano Sabatini
0d3ee13551
Use AVERROR_INVALIDDATA rather than -1 for nutdec error codes.
Originally committed as revision 26321 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Martin Storsjö
a6963f8304
aviobuf: Retry if the read/write function returns AVERROR(EAGAIN)
Originally committed as revision 26318 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Baptiste Coudurier
c3024f9e7e
In mov demuxer, handle better wrong time scale, fix issue #2528
Originally committed as revision 26311 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Baptiste Coudurier
f6253caf8b
In mov demuxer, set r_frame_rate for cfr files
Originally committed as revision 26310 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Daniel Kang
e048a9cab1
Do not crash for illegal sample size, fixes issue 2502.
Patch by Daniel Kang, daniel.d.kang at gmail
Originally committed as revision 26309 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Stefano Sabatini
440d761e40
Clarify timestamps related error messages in compute_pkt_fields2().
Originally committed as revision 26308 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Peter Ross
1c4ac03530
electronicarts: prevent endless loop opportunity in process_audio_header_elements()
Fixes issue2529.
Originally committed as revision 26307 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Peter Ross
74093bb593
revert r26302
Originally committed as revision 26305 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Peter Ross
e19e051e56
electronicarts: prevent endless loop opportunity in process_audio_header_elements()
Fixes issue2529.
Originally committed as revision 26302 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Peter Ross
42396c2e67
electronicarts: only apply audio sanity checks when audio stream is present
Originally committed as revision 26301 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Daniel Kang
cb77dad724
perform sanity check on sample rate in electronicarts demuxer
Fixes issue2525
Original patch by Daniel Kang, daniel.d.kang at gmail
Originally committed as revision 26298 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago