Michael Niedermayer
686959e87e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doxygen: Consistently use '@' instead of '\' for Doxygen markup.
Use av_printf_format to check the usage of printf style functions
Add av_printf_format, for marking printf style format strings and their parameters
ARM: enable thumb for Cortex-M* CPUs
nsvdec: Propagate error values instead of returning 0 in nsv_read_header().
build: remove SRC_PATH_BARE variable
build: move basic rules and variables to main Makefile
build: move special targets to end of main Makefile
lavdev: improve feedback in case of invalid frame rate/size
vfwcap: prefer "framerate_q" over "fps" in vfw_read_header()
v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters()
fbdev: prefer "framerate_q" over "fps" in device context
bktr: prefer "framerate" over "fps" for grab_read_header()
ALSA: implement channel layout for playback.
alsa: support unsigned variants of already supported signed formats.
alsa: add support for more formats.
ARM: allow building in Thumb2 mode
Conflicts:
common.mak
doc/APIchanges
libavcodec/vdpau.h
libavdevice/alsa-audio-common.c
libavdevice/fbdev.c
libavdevice/libdc1394.c
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-24 03:07:04 +02:00
Diego Biurrun
adbfc605f6
doxygen: Consistently use '@' instead of '\' for Doxygen markup.
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-06-24 00:37:49 +02:00
Michael Niedermayer
3c7650a83d
Merge remote-tracking branch 'qatar/master'
...
This early morning merge should fix --disable-yasm
* qatar/master:
Clean up #includes in cmdutils.h.
g729: Merge g729.h into g729dec.c.
10l: wrap float_interleave functions in HAVE_YASM.
Conflicts:
libavcodec/g729.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-19 13:00:31 +02:00
Diego Biurrun
a2077b85da
g729: Merge g729.h into g729dec.c.
...
The header contains just a single define that is only used in g729dec.c.
2011-05-19 10:21:37 +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
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
Stefano Sabatini
e4445e9c78
Make g729dec.c:decode_frame() return AVERROR_INVALIDDATA rather than
...
AVERROR_NOFMT in case of invalid / unknown packet size.
Originally committed as revision 22624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-21 16:34:01 +00:00
Stefano Sabatini
fd7cbc7f9c
Make g729dec.c:decoder_init() return AVERROR(EINVAL) rather than
...
AVERROR(NOFMT) if one channel if the number of channels specified
is different than 1.
Originally committed as revision 22591 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-18 00:23:02 +00:00
Vladimir Voroshilov
d266709055
Pitch delay decoding
...
Originally committed as revision 19281 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-26 17:43:05 +00:00
Vladimir Voroshilov
2b0691349f
Replace pitch_delay_int array with single variable.
...
Originally committed as revision 19280 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-26 17:42:25 +00:00
Vladimir Voroshilov
3c70902bf5
LSF (Line Spectral Frequencies) decoding routine.
...
Originally committed as revision 19260 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 04:38:48 +00:00
Vladimir Voroshilov
630c97ff4b
Convertion of LSF values to coefficients of linear prediction filter
...
Originally committed as revision 19240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-20 13:36:21 +00:00
Vladimir Voroshilov
17dbe25438
G.729 decoding routine (skeleton, including parameters decoding).
...
Originally committed as revision 19218 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-18 18:14:38 +00:00
Vladimir Voroshilov
94994d8d9a
G.729 decoder initialization routine (skeleton)
...
Originally committed as revision 19188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 02:31:06 +00:00
Vladimir Voroshilov
730c1e4a06
Replace MAX_SUBFRAME_SIZE and ctx->subframe_size with SUBFRAME_SIZE,
...
since subframe length is the same in all G.729 modes.
Originally committed as revision 19187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 02:29:39 +00:00
Vladimir Voroshilov
d4a9255699
K&R formatting of already submitted G.729 code
...
Originally committed as revision 19127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-06 17:40:33 +00:00
Vladimir Voroshilov
3bbc46102b
Convert structure names to FFmpeg style
...
Originally committed as revision 19123 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-06 12:42:11 +00:00
Vladimir Voroshilov
e72c65f583
Internal routine should not use name of standard function.
...
Use g729_prng instead.
Originally committed as revision 19120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-06 05:38:09 +00:00
Vladimir Voroshilov
8dbd0a95ee
Remove ff_g729_ and g729_ prefixes from static routines.
...
Originally committed as revision 19118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 17:11:46 +00:00
Stefano Sabatini
9106a698e7
Rename bitstream.h to get_bits.h.
...
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 16:20:26 +00:00
Kenan Gillet
60c25a4beb
Rename acelp_math.[ch] to celp_math.[ch] to prepare for QCELP decoder merge.
...
patch by Kenan Gillet, kenan.gillet gmail com
Originally committed as revision 15679 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 21:20:29 +00:00
Vladimir Voroshilov
1a18912e49
Another set of approved changes for G.729: includes, formats structure,
...
several parts of main decoding routine and initialization code.
Originally committed as revision 15341 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-17 06:05:12 +00:00
Vladimir Voroshilov
1357b1de00
Remove not approved parts.
...
Originally committed as revision 15224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 13:45:02 +00:00
Vladimir Voroshilov
bc165ee392
Another set of approved G.729 chunks (from decoder core)
...
Originally committed as revision 15168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 01:07:03 +00:00
Vladimir Voroshilov
d3bb8ad7af
Parity bit calculation routine for G.729
...
Originally committed as revision 15154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 17:15:28 +00:00
Vladimir Voroshilov
7ad909bd59
Another set of definitions for G.729
...
Originally committed as revision 14973 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 07:10:38 +00:00
Vladimir Voroshilov
fe3a80d6fa
Move from g729.h all definitions which are used only in g729dec.c
...
Originally committed as revision 14915 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 12:38:45 +00:00
Vladimir Voroshilov
5209846850
G.729 decoder main code
...
(just skeleton, contains only parts, explicitly ok'ed by Michael)
Originally committed as revision 14800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 08:43:37 +00:00