Anton Khirnov
d754ed4172
riffenc: take an AVStream instead of an AVCodecContext
...
It will be useful in the following commits.
Also, rename the AVCodecContext pointer name from 'stream' to 'codec'.
11 years ago
Daniel Verkamp
5e7d21c7ad
ff_put_wav_header: add flag to force WAVEFORMATEX
...
Partially undoes commit 2c4e08d89327595f7f4be57dda4b3775e1198d5e:
riff: always generate a proper WAVEFORMATEX structure in
ff_put_wav_header
A new flag, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX, is added to force the
use of WAVEFORMATEX rather than PCMWAVEFORMAT even for PCM codecs.
This flag is used in the Matroska muxer (the cause of the original
change) and in the ASF muxer, because the specifications for
these formats indicate explicitly that WAVEFORMATEX should be used.
Muxers for other formats will return to the original behavior of writing
PCMWAVEFORMAT when writing a header for raw PCM.
In particular, this causes raw PCM in WAV to generate the canonical
44-byte header expected by some tools.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
d32926db7f
avformat/riff: return error code from ff_get_guid()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Carl Eugen Hoyos
862174ec83
Move GUID-related objects to riffenc.c and riff.c.
...
This simplifies the following eac3-in-wav patch.
11 years ago
Peter Ross
fcbb94712d
riffenc: add option to ff_put_bmp_header to ignore extradata
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Diego Biurrun
971cce7ebb
riff.h: Remove stray extern declaration for non-existing symbol
11 years ago
Peter Ross
e544782623
riff: Move guid structs and helper functions into riff
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
12 years ago
rogerdpack
12c71f648c
dshow: Fix MSVC support, remove av_export, which was apparently unneeded anyway.
...
Also cleanup exported symbols
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
rogerdpack
aa715cdcf5
dshow: attempt to build shared as well as static
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
12 years ago
Justin Ruggles
bfe5454cd2
lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h
12 years ago
Victor Vasiliev
71e92414bf
lavf: move RIFF INFO tag writing from avienc to riff
...
It will be useful in the wav muxer.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years ago
Michael Niedermayer
bb2f13c19f
rename missed CodecID to AVCodecID
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Anton Khirnov
36ef5369ee
Replace all CODEC_ID_* with AV_CODEC_ID_*
12 years ago
Michael Niedermayer
76853a3e0c
libavformat: ff_get_bmp_header: return esize too
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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
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
Peter Ross
36ffabc4ee
move PRI_GUID, ARG_GUID, AVCodecGuid, ff_codec_guid_get_id, MEDIASUBTYPE_BASE_GUID and audio_guids[] to riff.c/h (add FF_ prefix to PRI_GUID, ARG_GUID, and MEDIASUBTYPE_BASE_GUID; rename audio_guids to ff_codec_wav_guids)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Peter Ross
c1309b27d2
move ff_asf_guid, ff_guidcmp and ff_get_guid into riff.h
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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
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
Peter Ross
456a70aeb8
add ff_get_bmp_header
...
Originally committed as revision 26091 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Francesco Lavra
80b39e1ca6
Move AVCodecTag from riff.h into internal.h.
...
Patch by Francesco Lavra, francescolavra interfree it
Originally committed as revision 23250 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Stefano Sabatini
83c2707908
Prefer enum CodecID over int in ff_codec_get_tag().
...
Originally committed as revision 23249 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Diego Biurrun
ba87f0801d
Remove explicit filename from Doxygen @file commands.
...
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.
Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Carl Eugen Hoyos
bc2d2a07d5
Make AVCodecTag.id enum CodecID and use CODEC_ID_NONE instead of 0.
...
Originally committed as revision 20250 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Daniel Verkamp
1a40491ef2
Add ff_ prefixes to exported symbols in libavformat/riff.h.
...
patch by Daniel Verkamp, aniel drv nu
Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Diego Biurrun
bad5537e2c
Use full internal pathname in doxygen @file directives.
...
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.
Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Carl Eugen Hoyos
9f2ace74ef
Fix two identical warnings when compiling riff.c and nuv.c with icc:
...
warning #188 : enumerated type mixed with another type
Originally committed as revision 16281 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Diego Biurrun
bc5c918ea8
Remove offset_t typedef and use int64_t directly instead.
...
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.
Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Stefano Sabatini
987903826b
Globally rename the header inclusion guard names.
...
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.' to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".
Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Diego Biurrun
245976da2a
Use full path for #includes from another directory.
...
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Diego Biurrun
5b21bdabe4
Add FFMPEG_ prefix to all multiple inclusion guards.
...
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago
Måns Rullgård
b3633dee58
remove deprecated codec_get_{bmp,wav}_{id,tag}()
...
Originally committed as revision 9530 to svn://svn.ffmpeg.org/ffmpeg/trunk
18 years ago
Måns Rullgård
99545457bf
include all prerequisites in header files
...
Originally committed as revision 9344 to svn://svn.ffmpeg.org/ffmpeg/trunk
18 years ago
Mark Cox
671adb1742
patch so that the deprecated items show up correctly
...
when building doxygen docs
patch by mark cox melbournemark plus ffmpeg minus devel chez gmail dot com
Originally committed as revision 8866 to svn://svn.ffmpeg.org/ffmpeg/trunk
18 years ago
Michael Niedermayer
7caf0cc62c
add codec_id <-> codec_tag tables to AVIn/OutputFormat
...
Originally committed as revision 7593 to svn://svn.ffmpeg.org/ffmpeg/trunk
18 years ago
Diego Biurrun
b78e7197a8
Change license headers to say 'FFmpeg' instead of 'this program/this library'
...
and fix GPL/LGPL version mismatches.
Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
18 years ago
Diego Biurrun
04d7f60143
Add official LGPL license headers to the files that were missing them.
...
Originally committed as revision 6219 to svn://svn.ffmpeg.org/ffmpeg/trunk
18 years ago
Måns Rullgård
9d9f4119bd
move common stuff from avienc.c and wav.c to new file riff.c
...
Originally committed as revision 5720 to svn://svn.ffmpeg.org/ffmpeg/trunk
19 years ago
Diego Biurrun
bb270c0896
COSMETICS: tabs --> spaces, some prettyprinting
...
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
19 years ago
Diego Biurrun
115329f160
COSMETICS: Remove all trailing whitespace.
...
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
19 years ago
Fabrice Bellard
155e9ee909
initial seek support
...
Originally committed as revision 2502 to svn://svn.ffmpeg.org/ffmpeg/trunk
21 years ago
Fabrice Bellard
4358d5def3
removed ctype.h header
...
Originally committed as revision 2225 to svn://svn.ffmpeg.org/ffmpeg/trunk
21 years ago
Zdenek Kabelac
546031ee86
* keeping compiler happy and quiet
...
Originally committed as revision 1817 to svn://svn.ffmpeg.org/ffmpeg/trunk
22 years ago
Zdenek Kabelac
5d23497493
* more strict types
...
Originally committed as revision 1815 to svn://svn.ffmpeg.org/ffmpeg/trunk
22 years ago
Roman Shaposhnik
e738cee9c4
Complete support for OpenDML AVIs and AVIs > 2Gb.
...
Originally committed as revision 1814 to svn://svn.ffmpeg.org/ffmpeg/trunk
22 years ago
Roman Shaposhnik
ce9fce63c5
AVI > 2Gb (OpenDML) generation patch by (Roman Shaposhnick <rvs at sun dot com>)
...
Originally committed as revision 1741 to svn://svn.ffmpeg.org/ffmpeg/trunk
22 years ago
Roman Shaposhnik
2e7973bbe7
correct AUDIO strf parsing patch by (Roman Shaposhnick <rvs at sun dot com>)
...
Originally committed as revision 1664 to svn://svn.ffmpeg.org/ffmpeg/trunk
22 years ago
Fabrice Bellard
abac617591
renamed libav to libavformat
...
Originally committed as revision 1276 to svn://svn.ffmpeg.org/ffmpeg/trunk
22 years ago