Carl Eugen Hoyos
7862bd3d4a
Cosmetics: Improve 'too short LIST' error message in wav.c.
13 years ago
Carl Eugen Hoyos
a8e93ce4cb
Do not reject LIST tags in wav with size 4.
...
Fixes ticket #745 .
13 years ago
Michael Niedermayer
02acfb1c01
wavdec: add ignore length option to ignore incorrect lengthes
...
like SOX
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Carl Eugen Hoyos
935ac228e4
Fix typo: Correctly parse 64 byte umid tags in bext metadata.
13 years ago
Clément Bœsch
215b7724e7
lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().
13 years ago
Anton Khirnov
c3f9ebf743
lavf: make av_set_pts_info private.
...
It's supposed to be called only from (de)muxers.
13 years ago
Victor Vasiliev
12bc20502a
Generalize RIFF INFO tag support; support reading INFO tag in wav
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years ago
Clément Bœsch
2f0f9a87d0
Fix various if parenthesis misplacements.
13 years ago
Clément Bœsch
0e5ecd806e
Replace remaining av_new_stream() with avformat_new_stream().
13 years ago
Anton Khirnov
3b3bbdd3e6
lavf,lavd: replace av_new_stream->avformat_new_stream part I.
...
Trivial replacements with sed are done in this commit:
sed 's/av_new_stream(\([^)]*\), 0)/avformat_new_stream(\1, NULL)/'
13 years ago
Anton Khirnov
145f741e11
AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*
13 years ago
Reimar Döffinger
4b4a6ebd68
Support playing SMV files.
...
Audio and video are interleaved via stream cur_dts - no idea how
reliable this is.
It also cannot display the video properly - it is stored with
about 15 in a single JPEG frame, I cannot think of a reasonable
way to implement this.
Samples: http://samples.mplayerhq.hu/smv/
Format description: http://wiki.multimedia.cx/index.php?title=SMV
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
13 years ago
Clément Bœsch
3dd2c8bbbc
wav: init st to NULL to avoid a false-positive warning.
...
If st is NULL, it means no 'fmt ' tag is found, but 'data' tag (which
needs a previous 'fmt ' tag to be parsed correctly and st initialized)
check will make sure st is never dereferenced in that case.
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
6270995667
wav: remove a use of deprecated AV_METADATA_ macro
14 years ago
Tomas Härdin
b21e6b707f
wav: parse 'bext' metadata
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Tomas Härdin
67b1761fcb
wav: keep parsing until EOF if the input is seekable and we know the size of the data tag
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Tomas Härdin
90f2ee8cb4
wav: Refactor the tag checking into a switch statement
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Tomas Härdin
1cf18de982
wav: make sure neither data_size nor sample_count is negative.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Tomas Härdin
7f84055e2d
wav: refactor the 'fmt ' tag search and parsing.
...
Moving the search and parsing of the 'fmt ' info the main loop of
wav_read_header() allows tags that precede it to be parsed. Creating
wav_parse_fmt_tag() makes wav_read_header() easier to read.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Benjamin Larsson
a4ad943860
wav: add an option for writing BEXT chunk
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Mans Rullgard
0ebcdf5cda
Do not include mathematics.h in avutil.h
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Carl Eugen Hoyos
8d0786ec6d
wav: remove an invalid free().
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Aurelien Jacobs
e6ba3d4281
replace remaining usage of deprecated av_metadata_set2() by av_dict_set()
14 years ago
Michael Niedermayer
c9614bb22c
wav: update size check for ds64
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Philip de Nier
e472f0ea5a
wav: fix skip size at end of ds64 chunk
14 years ago
Tomas Härdin
f86d260df3
wav: Don't avio_seek() if we know we'll run into EOF
...
Since we want to break the loop the 'if (data_ofs < 0)' block is moved after the loop.
This fixes ticket #250 .
14 years ago
Tomas Härdin
2660e9e1f3
Add metadata conversion table to the wav demuxer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Stefano Sabatini
8d953175d4
wav: fix various printf warnings related to wrong argument type
14 years ago
Stefano Sabatini
e9f4001a30
wav: propagate ff_get_wav_header() error code in w64_read_header()
...
Alos fix warning:
wav.c: In function ‘w64_read_header’:
wav.c:546: warning: ‘ret’ may be used uninitialized in this function
14 years ago
Tomas Härdin
7e5cb2ef51
Parse 'bext' metadata in the wav demuxer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Tomas Härdin
40612f2601
Cosmetics: indent
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Tomas Härdin
6629dbd299
Keep parsing wav until EOF if the input is seekable and we know the size of the data tag
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Tomas Härdin
a06d238e8c
Refactor the tag checking into a switch statement
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Tomas Härdin
93df511ec7
Use avio_tell() instead of url_ftell()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Tomas Härdin
3d922c8462
Make sure neither data_size nor sample_count is negative
14 years ago
Tomas Härdin
cc1ca9e534
Refactor the 'fmt ' tag search and parsing
...
Moving the search and parsing of the 'fmt ' info the main loop of wav_read_header() allows tags that precede it to be parsed.
Creating wav_parse_fmt_tag() makes wav_read_header() easier to read.
14 years ago
Max Horn
ca402f32e3
handle malloc failures in ff_get_wav_header
...
ff_get_wav_header is reading data from a WAVE file and then uses it
(without validation) to malloc a buffer. It then proceeded to read
data into the buffer, without verifying that the allocation succeeded.
To address this, change ff_get_wav_header to return an error if
allocation failed, and adapted all calling code to handle that error.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
14 years ago
Anton Khirnov
8978fedaee
avio: introduce an AVIOContext.seekable field
...
Use it instead of url_is_streamed and AVIOContext.is_streamed.
14 years ago
Carl Eugen Hoyos
c9d6da73a8
Remove superfluous free().
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
45a8a02a41
lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
66e5b1df36
avio: deprecate url_feof
...
AVIOContext.eof_reached should be used directly instead.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
384c9c2fa7
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a2704c9712
)
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
74b3f67c9c
lavf: replace all uses of url_fskip with avio_seek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e356fc57a2
)
14 years ago
Anton Khirnov
f59d8ff8cd
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b4aa5dac8
)
14 years ago
Anton Khirnov
e356fc57a2
lavf: replace all uses of url_fskip with avio_seek
...
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