virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
29,649 Commits 37 Branches 400 Tags 463 MiB
7d62475656
Commit Graph

29 Commits

Author SHA1 Message Date
Michael Niedermayer
be315a3232 Merge remote branch 'qatar/master' 
* qatar/master:
Duplicate  AMV: disable DR1 and don't override EMU_EDGE
Duplicate  lavf: inspect more frames for fps when container time base is coarse
Wrong and we have correct fix: Fix races in default av_log handler
  vorbis: Replace sized int_fast integer types with plain int/unsigned.
  Remove disabled non-optimized code variants.
NO  bswap.h: Remove disabled code.
  Remove some disabled printf debug cruft.
  Replace more disabled printf() calls by av_dlog().
NO  tests: Remove disabled code.
NO  Replace some commented-out debug printf() / av_log() messages with av_dlog().
  vorbisdec: Replace some sizeof(type) by sizeof(*variable).
NO  vf_fieldorder: Replace FFmpeg by Libav in license boilerplate.

Conflicts:
	libavcodec/h264.c
	libavcodec/vorbisdec.c
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-30 01:58:26 +02:00
Diego Biurrun
cf3ac54339 vorbis: Replace sized int_fast integer types with plain int/unsigned. 
int/unsigned is the natural memory access type for CPUs, using sized types
for temporary variables, counters and similar just increases code size and
can possibly cause a slowdown.
 2011-04-29 20:28:40 +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
James Darnley
9577838f2f Fix libvorbis encoding with more than 2 channels 
Fixes issue 1325.

Patch by James Darnley, james dot darnley at gmail

Originally committed as revision 23818 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-27 09:25:05 +00:00
Måns Rullgård
3da1180409 Move some prototypes from dsputil.c to reasonable header files 
Originally committed as revision 22260 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-06 22:36:45 +00:00
Robert Swain
4a27f326c5 Add support for vorbis 6.1 and 7.1 channel configurations as per the new spec 
http://xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-800004.3.9

Originally committed as revision 21527 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-29 13:51:25 +00:00
Robert Swain
53a71e1ba4 Add vorbis channel layout support according to those defined in the Vorbis I 
specification

Originally committed as revision 20148 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-02 12:59:37 +00:00
Diego Biurrun
5e56b30e1f brace placement and linebreak cosmetics 
Originally committed as revision 20070 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-28 21:13:47 +00:00
Oded Shimon
05dee1b7df Rename all vorbis encoder related typedefs to not use _t for POSIX compatibility 
Originally committed as revision 16076 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-12 05:12:51 +00:00
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
 2008-08-31 07:39:47 +00:00
Stefan Gehrer
cf2baeb338 mark read-only data as const 
Originally committed as revision 13947 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-24 20:01:31 +00:00
Diego Biurrun
5b21bdabe4 Add FFMPEG_ prefix to all multiple inclusion guards. 
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-17 09:37:46 +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
Oded Shimon
7f09a56091 remove render_line from vorbis.h, add ff_vorbis_floor1_render_list instead 
Originally committed as revision 6409 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-01 17:38:07 +00:00
Oded Shimon
e8f42cc0f5 prevent warning in vorbis_data.c 
Originally committed as revision 6404 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-01 13:53:08 +00:00
Oded Shimon
ded515b241 100l, broke ffmpeg compilation, ABS() and uint* types not defined in vorbis_data.c 
Originally committed as revision 6403 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-01 13:45:17 +00:00
Oded Shimon
6c29d7c8f3 make some more functions global so they can be shared with vorbis_enc.c 
Originally committed as revision 6402 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-01 11:59:33 +00:00
Oded Shimon
9f963af5a0 make ready_floor1_list() shared for vorbis_enc.c 
Originally committed as revision 6401 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-01 11:11:30 +00:00
Oded Shimon
cc0ba5a58f vorbis.h -> vorbis_data.c 
move tables from vorbis.h to a C file so they can be used later in
vorbis_enc.c

Originally committed as revision 6398 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-30 18:47:15 +00:00
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
 2006-09-10 14:02:42 +00:00
Loren Merritt
0e0adae0ba vorbis cosmetics: mdct0,mdct1 => mdct[2] 
Originally committed as revision 5978 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-10 21:57:30 +00:00
Loren Merritt
eb4825b5d4 sse and 3dnow implementations of float->int conversion and mdct windowing. 
15% faster vorbis.

Originally committed as revision 5975 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-10 19:06:25 +00:00
Loren Merritt
2dac4acfc0 sse & sse2 implementations of vorbis channel coupling. 
9% faster vorbis (on a K8).

Originally committed as revision 5898 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-03 03:18:47 +00:00
Alexander Strasser
04c669ba98 Correct the relation between floors of type 0 and block sizes. 
Originally committed as revision 4941 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-05 10:16:20 +00:00
Alexander Strasser
f9c5c13af5 Cosmetic: Fix indentation. 
Originally committed as revision 4935 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-04 10:04:13 +00:00
Alexander Strasser
43eb59087b Added support for vorbis files containing floor type 0. 
Originally committed as revision 4933 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-04 08:55:34 +00:00
Michael Niedermayer
5a408f91e6 decrease V_NB_BITS if possible 
Originally committed as revision 4327 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-30 22:02:00 +00:00
Michael Niedermayer
13c2469d7f Vorbis sse fix by (Balatoni Denes: dbalatoni, programozo hu) 
Originally committed as revision 4317 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-29 22:11:05 +00:00
Michael Niedermayer
0bde73d907 Vorbis decoder by (Balatoni Denes | dbalatoni programozo hu) 
Originally committed as revision 4261 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-17 19:02:43 +00:00