Martin Storsjö
20234a4bd7
cosmetics: Align muxer/demuxer declarations
...
Also add missing trailing commas, break long codec_tag lines and
add spaces in codec_tag declarations.
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Anton Khirnov
2dfea12058
mp3enc: write attached pictures (APIC).
13 years ago
Anton Khirnov
c68148b1ea
mp3enc: move mp3_write_xing() further up in the file.
...
It will be need by new functions called from mp3_write_trailer().
13 years ago
Anton Khirnov
411225aabc
id3v2enc: split ff_id3v2_write().
...
This will allow writing the tag in several steps, needed for writing
attached pictures.
13 years ago
Reimar Döffinger
bb3244dee2
Replace all usage of strcasecmp/strncasecmp
...
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>
13 years ago
Michael Karcher
16ad77b357
Move id3v2 tag writing to a separate file.
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
13 years ago
Anton Khirnov
82ab61f901
lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf.
...
Specifically, ff_mpa_freq_tab, ff_mpa_bitrate_tab, ff_mpa_decode_header,
ff_mpegaudio_decode_header.
13 years ago
Anton Khirnov
145f741e11
AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*
13 years ago
Diogo Franco
f1f298cd32
Do not write ID3v1 tags by default
...
ID3v1 are legacy tags with several limitations; furthermore
avconv/ffmpeg writes the tags in UTF-8 which probably has near-0
software support.
Add a -write_id3v1 option to be able to turn it on; disabled by default.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
13 years ago
Anton Khirnov
dfc2c4d900
lavf: use designated initialisers for all (de)muxers.
...
It's more readable and less prone to breakage.
14 years ago
Anton Khirnov
bda168d2b0
mp3enc: write a xing frame containing number of frames in the file
14 years ago
Anton Khirnov
d2d67e424f
Remove all uses of now deprecated metadata functions.
14 years ago
Anton Khirnov
f0029cbcf6
lavf: use designated initializers for AVClasses.
14 years ago
Anton Khirnov
b66752790a
AVOptions: make default_val a union, as proposed in AVOption2.
...
This breaks API and ABI.
14 years ago
Alex Converse
1a5e4fd8c5
Replace strncpy() with av_strlcpy().
14 years ago
Anton Khirnov
6dc7d80de7
avio: avio_ prefix for url_close_dyn_buf
14 years ago
Anton Khirnov
b92c545282
avio: avio_ prefix for url_open_dyn_buf
14 years ago
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Anton Khirnov
b7f2fdde74
avio: rename put_flush_packet -> avio_flush
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
fed5676ffe
mp3enc: remove mp3_write_packet(), use ff_raw_write_packet() instead
...
The two functions are identical, no point in duplicating code here.
14 years ago
Anton Khirnov
a2704c9712
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
6b4aa5dac8
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
77eb5504d3
avio: avio: avio_ prefixes for put_* functions
...
In the name of consistency:
put_byte -> avio_w8
put_<type> -> avio_w<type>
put_buffer -> avio_write
put_nbyte will be made private
put_tag will be merged with avio_put_str
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
5a6de4e7e8
mp3enc: write ISO8859-1 instead of UTF-16 when possible
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Diego Elio Pettenò
c6610a216e
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
...
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
14 years ago
Anton Khirnov
22272f61bb
mp3enc: support for id3v2.3 tags using a per-muxer AVOption
...
fixes issue2562.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
14 years ago
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>
14 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>
14 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>
14 years ago
Anton Khirnov
d08928bbea
Split mp3 demuxer and muxer into separate files.
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Michael Niedermayer
7cf0472e6a
Fix assertion failure due to frames being 0 in mp3 vbr bitrate calculation.
...
Fixes issue 2442.
Originally committed as revision 26121 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Reimar Döffinger
b72daad062
Remove hack in MP3 probe that was meant as a work-around for large
...
ID3v2 tags which no longer works since ID3v2 handling was moved to
generic code.
In addition, in caused false-positives for all files starting with
one or more 0-bytes.
Originally committed as revision 25929 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Anton Khirnov
ad7768f4c4
add ff_ prefix to metadata_conv()
...
patch by Anton Khirnov anton _at_ khirnov _dot_ net
Originally committed as revision 25505 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Anton Khirnov
03700d399b
Export metadata in the generic format. Deprecate old conversion API.
...
patch by Anton Khirnov anton _at_ khirnov _dot_ net
Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Reimar Döffinger
6612d8cf31
Move handling of ID3v2 to common utils.c code, reducing code duplication
...
and supporting it for more formats, fixing issue 2258.
Originally committed as revision 25378 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Alexander Kojevnikov
2a758efe31
Make frames unsigned.
...
Patch by Alexander Kojevnikov, alexander kojevnikov com
Originally committed as revision 24540 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Alexander Kojevnikov
49d7ef282d
Show correct bitrate for VBR MP3 files.
...
Patch by Alexander Kojevnikov, alexander kojevnikov com
Originally committed as revision 24539 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
James Darnley
90d9d97d4d
Fix ID3v1 tags in mp3 files
...
Patch by James Darnley, james dot darnley at gmail
Originally committed as revision 24189 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Karcher
3a1350e8d9
Generalize ID3v2 functions to support ID3v2-like ID headers with a
...
different magic in the header (mainly targeted to Sony's .oma/.aa3
format).
Patch by Michael Karcher, ffmpeg A mkarcher dialup fu-berlin de
Originally committed as revision 23583 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Baptiste Coudurier
2293a2e67f
Set AVFMT_NOTIMESTAMPS flag for mp3 muxer
...
Fixes issue 1026
Originally committed as revision 22916 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Stefano Sabatini
72415b2adb
Define AVMediaType enum, and use it instead of enum CodecType, which
...
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
5692ed3ad4
Many mp3s seem to contain padding after id3 tags that is not considered in the
...
tag size. Skip this to make the format probing quicker.
Originally committed as revision 22111 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Anton Khirnov
ed7694d8cf
Set lavf identification string globally in av_write_header(), rather
...
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
15 years ago
Andreas Öman
80242f9bdb
mp3: ftell() file offset for VBR tags before ID3v1 parser messes it up.
...
Originally committed as revision 21737 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Anton Khirnov
ca76a11948
Add a list of generic tags and change demuxers to follow it.
...
Patch by Anton Khirnov, wyskas at gmail dot com
Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Baptiste Coudurier
9c5a9e6b48
set mp3 timebase to the lcm of all mp3 sample rates to fix frame duration
...
Originally committed as revision 20579 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Diego Biurrun
0cd0a22488
Move function that is only used by the MP3 muxer below the corresponding #if.
...
This removes the dependency of the MP2 muxer on the id3v2 object file.
Originally committed as revision 20329 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Diego Biurrun
ff06d76acd
Add '#include "libavutil/intreadwrite.h"', necessary for AV_RB32.
...
This fixes the build with demuxers disabled.
Originally committed as revision 20327 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
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
15 years ago