Michael Niedermayer
faba79e080
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
H.264: tweak some other x86 asm for Atom
probe: Fix insane flow control.
mpegts: remove invalid error check
s302m: use nondeprecated audio sample format API
lavc: use designated initialisers for all codecs.
x86: cabac: add operand size suffixes missing from 6c32576
Conflicts:
libavcodec/ac3enc_float.c
libavcodec/flacenc.c
libavcodec/frwu.c
libavcodec/pictordec.c
libavcodec/qtrleenc.c
libavcodec/v210enc.c
libavcodec/wmv2dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-30 06:46:08 +02:00
Anton Khirnov
ec6402b7c5
lavc: use designated initialisers for all codecs.
...
It's more readable and less prone to breakage.
2011-07-29 08:42:34 +02:00
Michael Niedermayer
5d1b39f7e7
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
build: clean up library installation rules
vf_drawtext: Remove some write-only variables.
libgsm: Drop const qualifier to silence compiler warning.
docs: Remove needless configure options
docs: Don't recommend adding --enable-memalign-hack
libvo-amrwbenc: Add braces to shut up gcc warning.
adts: Fix PCE copying.
Conflicts:
configure
doc/general.texi
subdir.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-08 01:05:28 +02:00
Diego Biurrun
357d0d8fc7
libgsm: Drop const qualifier to silence compiler warning.
...
libavcodec/libgsm.c:148: warning: passing argument 2 of ‘gsm_decode’ discards qualifiers from pointer target type
/usr/include/gsm/gsm.h:68: note: expected ‘gsm_byte *’ but argument is of type ‘const uint8_t *’
2011-07-07 15:21:22 +02:00
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Diego Elio Pettenò
e7e2df27f8
Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
...
None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69
)
2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
d36beb3f69
Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
...
None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-26 16:08:45 +00:00
Stefano Sabatini
5d6e4c160a
Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum
...
SampleFormat with AVSampleFormat.
Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-12 11:04:40 +00:00
Rodney Baker
2d525ef483
Change all occurences of "inofficial" to "unofficial" in code, comments
...
and options. Keep old options until next major version bump.
Patch by Rodney Baker, rodney d baker a iinet d net d au
Originally committed as revision 24021 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-03 15:35:23 +00:00
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
2010-04-20 14:45:34 +00:00
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
2010-03-30 23:30:55 +00:00
Ramiro Polla
3beb81e744
Fix compilation with --enable-libgsm on Gentoo and OpenSUSE.
...
Patch by Ramiro
Originally committed as revision 21786 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-13 03:43:10 +00:00
Reimar Döffinger
b5f09d31c2
Make sample_fmts and channel_layouts compound literals const to reduce size of
...
.data section.
Originally committed as revision 19787 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-06 09:15:07 +00:00
Thilo Borgmann
7a00bbad21
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
...
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.
Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.
Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 15:59:50 +00:00
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
2009-02-01 02:00:19 +00:00
Martin Storsjö
916ff02261
Fix memory leak in libgsm wrapper.
...
Patch by Martin Storsjö, martin at martin dot st
Originally committed as revision 15798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-10 20:02:00 +00:00
Peter Ross
fd76c37fd9
Modify all codecs to report their supported input and output sample format(s).
...
Originally committed as revision 14482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 10:47:31 +00:00
Stefano Sabatini
fe4bf37455
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
...
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 21:50:13 +00:00
Michael Niedermayer
0dfea024e1
indent
...
Originally committed as revision 13021 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-29 18:32:06 +00:00
Michael Niedermayer
ef79ef3c11
Fix decoding of:
...
http://samples.mplayerhq.hu/A-codecs/msgsm/levis.avi
http://samples.mplayerhq.hu/A-codecs/msgsm/wernfried_1.avi
partially fix decoding of:
http://samples.mplayerhq.hu/A-codecs/GSM/sample-gsm-8000.gsm
Allow the user to encode non standard samplerates by using -strict
Originally committed as revision 13020 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-29 18:31:29 +00:00
Stefano Sabatini
6140271f54
Add some long names to AVCodec declarations.
...
patch by Stefano Sabatini, stefano.sabatini-lala poste it
Originally committed as revision 13017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-29 07:24:44 +00:00
Michel Bardiaux
202aca676f
Make sure some value is always returned via data_size
...
Originally committed as revision 12955 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 13:25:11 +00:00
Michel Bardiaux
96ddaff5ec
Allow bitrates zero and 13200 (needed for decoding mov and aiff)
...
Originally committed as revision 12953 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 13:05:15 +00:00
Zuxy Meng
98a6fff98c
Apply 'cold' attribute to init/uninit functions in libavcodec
...
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 03:11:20 +00:00
Diego Biurrun
df3a80b50a
cosmetics: misc typo fixes
...
Originally committed as revision 9815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-28 12:46:26 +00:00
Diego Biurrun
b04f49c74c
Give names of external library decoders/encoders a lib prefix
...
in the ffmpeg/ffplay output.
Originally committed as revision 9227 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-06 08:41:45 +00:00
Michel Bardiaux
346a655d46
Add support for MS-GSM codec
...
Originally committed as revision 8039 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-20 11:09:47 +00:00
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
2006-10-07 15:30:46 +00:00
Diego Biurrun
5509bffa88
Update licensing information: The FSF changed postal address.
...
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Diego Biurrun
115329f160
COSMETICS: Remove all trailing whitespace.
...
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Michael Niedermayer
bb4c2140c2
libgsm warper by (Alban Bedel: albeu, free fr)
...
Originally committed as revision 4302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-22 23:39:11 +00:00