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
Anton Khirnov
324429309e
lavf: use a new ffio_wfourcc macro instead of put_tag() where possible
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 0abdb29317
)
14 years ago
Anton Khirnov
0abdb29317
lavf: use a new ffio_wfourcc macro instead of put_tag() where possible
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
e9eb8d0bce
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>
(cherry picked from commit 77eb5504d3
)
14 years ago
Anton Khirnov
e63a362857
avio: avio_ prefixes for get_* functions
...
In the name of consistency:
get_byte -> avio_r8
get_<type> -> avio_r<type>
get_buffer -> avio_read
get_partial_buffer will be made private later
get_strz is left out becase I want to change it later to return
something useful.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b7effd4e83
)
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
b7effd4e83
avio: avio_ prefixes for get_* functions
...
In the name of consistency:
get_byte -> avio_r8
get_<type> -> avio_r<type>
get_buffer -> avio_read
get_partial_buffer will be made private later
get_strz is left out becase I want to change it later to return
something useful.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
471fe57e1a
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd
)
14 years ago
Anton Khirnov
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Diego Elio Pettenò
66355be3c3
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.
(cherry picked from commit c6610a216e
)
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
Michael Niedermayer
f9329946d0
Parse fact chunks from wav files to find duration.
...
Originally committed as revision 26370 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 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
14 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
14 years ago
Aurelien Jacobs
e94204dfd8
move pcm demuxers to their own file
...
Originally committed as revision 24993 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Baptiste Coudurier
f0187d20d1
In wav muxer, always flush in write_trailer, fix pipe output
...
Originally committed as revision 24568 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Daniel Verkamp
f45a27dc52
Reindent
...
Originally committed as revision 21747 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Daniel Verkamp
b7e0f88f2b
Fix demuxing of wav files with broken data header
...
Originally committed as revision 21746 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Daniel Verkamp
70d8c762d9
Reindent
...
Originally committed as revision 20182 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Daniel Verkamp
811e0fc2e8
Add RF64 support to wav demuxer.
...
Originally committed as revision 20181 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Reimar Döffinger
3fcb5113c6
wav demuxer: return AVERROR_EOF instead of AVERROR(EIO) when the end of
...
the file is reached normally, without any error.
Originally committed as revision 20143 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Reimar Döffinger
e581b6288f
wav: return av_get_packet errors unchanged.
...
Originally committed as revision 20142 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago