generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
71,723 Commits 24 Branches 241 Tags 173 MiB
7104301638
Commit Graph

119 Commits

Author SHA1 Message Date
Justin Ruggles
e61a670b53 g726: use int16_t instead of short 2011-11-01 21:23:02 -04:00
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
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
Justin Ruggles
c7d89948a3 Set a constant frame size for encoding G.726 audio. 
Originally committed as revision 25107 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-11 19:52:09 +00:00
Reimar Döffinger
edac49daf5 Use "const" qualifier for pointers that point to input data of 
audio encoders.
This is purely for clarity/documentation purposes.

Originally committed as revision 24481 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-24 13:59:49 +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
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
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
Stefano Sabatini
b275500706 Split bitstream.h, put the bitstream writer stuff in the new file 
put_bits.h.

Originally committed as revision 18461 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-12 08:35:26 +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
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences. 
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 15:46:40 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Diego Biurrun
f544a5fc84 Replace generic CONFIG_ENCODERS preprocessor conditionals by more specific 
CONFIG_FOO_ENCODER conditionals where appropriate.

Originally committed as revision 15174 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 12:33:21 +00:00
Laurent Aimar
bd10f6e149 Prevent a division by 0 in the g726 decoder when the configured samplerate is 0. 
patch by Laurent Aimar, fenrir via.ecp fr

Originally committed as revision 15160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-02 23:09:14 +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
Michael Niedermayer
74d9441715 Do not shift F[I] twice, it is also clearer and smaller now. 
Originally committed as revision 13818 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-19 11:04:31 +00:00
Michael Niedermayer
50c52d2250 Factorize c->ap += (-c->ap) >> 4 out 
Originally committed as revision 13817 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-19 11:00:17 +00:00
Michael Niedermayer
0e0d6cfd48 Get rid of G726Tables.bits. 
Originally committed as revision 13816 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-19 10:52:47 +00:00
Michael Niedermayer
05c9f3516c Copy 4 pointers to avid dozends of ptr dereferences. 
Originally committed as revision 13815 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-19 10:49:30 +00:00
Michael Niedermayer
fc234250b4 Does not need to be int16. 
Originally committed as revision 13814 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-19 10:38:20 +00:00
Michael Niedermayer
cb26c9d664 Factorize I >> (c->tbls->bits - 1) out. 
Originally committed as revision 13812 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-19 10:29:36 +00:00
Michael Niedermayer
73ff4f8344 1 abs() less 
Originally committed as revision 13810 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-19 10:02:39 +00:00
Michael Niedermayer
4714776b6a simplify 
Originally committed as revision 13807 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-18 21:09:36 +00:00
Michael Niedermayer
673a64b89b useless () 
Originally committed as revision 13806 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-18 21:05:07 +00:00
Michael Niedermayer
428c82cbac remove unneeded tr == 0 
Originally committed as revision 13805 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-18 21:00:44 +00:00
Michael Niedermayer
e079a1c94f simplify 
Originally committed as revision 13804 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-18 20:54:21 +00:00
Michael Niedermayer
c79c1a01a7 Get rid of the redundant AVG726Context. 
Originally committed as revision 13803 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-18 20:51:12 +00:00
Michael Niedermayer
ef4c5c6dba Remove the truncated bitstream handling from our g726 decoder. 
The stuff belongs in a parser.

Originally committed as revision 13802 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-18 19:18:32 +00:00
Michael Niedermayer
a0e5830ac5 Change iquant tables to int16. 
Originally committed as revision 13798 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-17 14:03:00 +00:00
Michael Niedermayer
6aa37bcf19 simplify 
Originally committed as revision 13797 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-17 13:46:59 +00:00
Michael Niedermayer
cf409a6fec Get rid of useless wrapper function. 
Originally committed as revision 13796 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-17 13:40:40 +00:00
Michael Niedermayer
170efe1f9d Do not inline g726_iterate() the function is big so its inlining will 
not help speedwise IMHO.
.o size changes from 70k -> 49k

Originally committed as revision 13793 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-17 00:09:42 +00:00
Michael Niedermayer
aeaa7c3d00 Replace i2f(0) by the actual thing done, gcc is not an optimizing compiler. 
a little over 1kb smaller .o

Originally committed as revision 13792 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-16 23:57:12 +00:00
Michael Niedermayer
8112075415 Remove redundant zeroing (the context is memset(0)). 
Originally committed as revision 13791 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-16 23:53:34 +00:00
Michael Niedermayer
e3cafac638 Use smaller data types for tables. 
Originally committed as revision 13790 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-16 23:51:07 +00:00
Michael Niedermayer
deec52ccf2 Float11 does not need int, .o file becomes smaller and the code might 
be faster.

Originally committed as revision 13789 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-16 23:34:15 +00:00
Michael Niedermayer
7d7a9e7f37 simplify 
Originally committed as revision 13788 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-16 23:31:23 +00:00
Michael Niedermayer
aca490777f Correct validity checks. 
Originally committed as revision 13787 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-16 23:23:56 +00:00
Michael Niedermayer
8b470cc542 Print sane error message for channels != 1. 
Originally committed as revision 13786 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-16 23:20:11 +00:00
Michael Niedermayer
35d0e16ba1 Check number of bits so we do not try to use table entries which do not exist. 
Originally committed as revision 13785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-16 23:16:44 +00:00
Michael Niedermayer
8161c28c67 Support decoding of sample_g726.asf. 
Originally committed as revision 13784 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-16 23:12:50 +00:00
Michael Niedermayer
6dfcdc00b3 get_bits() outputs exactly as many bits as requested no need to mask them. 
Originally committed as revision 13782 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-16 20:42:54 +00:00
Michael Niedermayer
f6ec220cb5 Remove dead code. 
Originally committed as revision 13781 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-16 20:40:44 +00:00
Michael Niedermayer
5171fd9dd5 -0x8000 == 0x8000 with int16 
fixes segfault / issue491

Originally committed as revision 13767 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-13 19:30:27 +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
Stefano Sabatini
d5202e4fda Add long names to many AVCodec declarations. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13005 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-27 10:52:44 +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
Michael Niedermayer
cea9642014 Fix ;; 
Originally committed as revision 12153 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-19 22:09:08 +00:00
Michael Niedermayer
5cbbbf378f const 
Originally committed as revision 11751 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 14:36:44 +00:00
Diego Pettenò
9307db13f6 Mark the tables in g726.c as constant. 
Patch by Diego 'Flameeyes' Pettenò flameeyes ¤ gmail ! com

Originally committed as revision 11444 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-07 12:43:04 +00:00
Diego Biurrun
2029f312e8 Remove redundant #inclusion of common.h, avcodec.h already #includes it. 
Originally committed as revision 8967 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-10 09:00:44 +00:00
Reimar Döffinger
f66e4f5f9e Add av_ prefix to clip functions 
Originally committed as revision 8122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-25 10:27:12 +00:00
François Revol
8fa36ae09d This fixes error handling for BeOS, removing the need for some ifdefs. 
AVERROR_ defines are moved to avcodec.h as they are needed in there as well. Feel free to move that to avutil/common.h.
Bumped up avcodec/format version numbers as though it's binary compatible we will want to rebuild apps as error values changed.
Please from now on use return AVERROR(EFOO) instead of the ugly return -EFOO in your code.
This also removes the need for berrno.h.

Originally committed as revision 7965 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-13 18:26:14 +00:00
Steve L'Homme
e344c1ea36 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com 
Originally committed as revision 6864 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-01 21:09:14 +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
Måns Rullgård
62bb489b13 add some #ifdef CONFIG_ENCODERS/DECODERS 
Originally committed as revision 6356 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-27 19:54:07 +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
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting 
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 01:10:11 +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
9cd8179818 #defines for strict_std_compliance and split between inofficial extensions and non standarized things 
Originally committed as revision 4205 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-08 20:15:42 +00:00
Michael Niedermayer
caa336b4cc common.c -> bitstream.c (and the single non bitstream func -> utils.c) 
common.h -> common.h/bitstream.h

Originally committed as revision 3777 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-29 17:50:25 +00:00
Michael Niedermayer
ef9c5d84be make comments doxygen compatible 
Originally committed as revision 3333 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-22 18:55:36 +00:00
Roman Shaposhnik
826ca10408 * gotta setup coded_frame for encoding. avcodec.h says that for decoding 
lavc is supposed to set it up as well and I don't think I see any
      reason not to.

Originally committed as revision 2769 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-10 20:48:09 +00:00
Michael Niedermayer
eb5b0422b5 use clip() from common.h 
ignore sample_rate==8000 limit if strict_std_compliance < 0

Originally committed as revision 2762 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-07 15:33:00 +00:00
Roman Shaposhnik
e5966052ee * Initial implementation of the G.726 ADPCM audio codec. 
Originally committed as revision 2759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-02-07 08:20:00 +00:00