virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
32,325 Commits 37 Branches 400 Tags 460 MiB
d2084402e6
Commit Graph

43 Commits

Author SHA1 Message Date
Michael Niedermayer
78accb876c Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ffmpeg: fix some indentation
  ffmpeg: fix operation with --disable-avfilter
  simple_idct: remove disabled code
  motion_est: remove disabled code
  vc1: remove disabled code
  fate: separate lavf-mxf_d10 test from lavf-mxf
  cabac: Move code only used in the cabac test program to cabac.c.
  ffplay: warn that -pix_fmt is no longer working, suggest alternative
  ffplay: warn that -s is no longer working, suggest alternative
  lavf: rename enc variable in utils.c:has_codec_parameters()
  lavf: use designated initialisers for all (de)muxers.
  wav: remove a use of deprecated AV_METADATA_ macro
  rmdec: remove useless ap parameter from rm_read_header_old()
  dct-test: remove write-only variable
  des: fix #if conditional around P_shuffle
  Use LOCAL_ALIGNED in ff_check_alignment()

Conflicts:
	ffmpeg.c
	libavformat/avidec.c
	libavformat/matroskaenc.c
	libavformat/mp3enc.c
	libavformat/oggenc.c
	libavformat/utils.c
	tests/ref/lavf/mxf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-17 20:12:02 +02:00
Diego Biurrun
fd065d3e79 cabac: Move code only used in the cabac test program to cabac.c. 2011-07-17 12:56:42 +02:00
Michael Niedermayer
15285d8fc5 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (22 commits)
  arm: remove disabled function dct_unquantize_h263_inter_iwmmxt()
  Remove commented-out call to non-existing function print_pow1().
  Do not decode RV30 files if the extradata is too small
  flashsv: split flashsv_decode_block() off from flashsv_decode_frame().
  ppc: remove disabled code
  libspeexdec: Drop const qualifier to silence compiler warning.
  libopenjpeg: Drop const qualifier to silence compiler warning.
  alac: Remove unused dummy code.
  Remove unused structs and tables.
  vaapi: do not assert on value read from input bitstream
  flashsvenc: replace bitstream description by a link to the specification
  flashsvenc: drop unnecessary cast
  flashsvenc: improve some variable names and fix corresponding comments
  flashsvenc: merge two consecutive if-conditions
  flashsvenc: merge variable declarations and initializations
  flashsvenc: convert some debug av_log() to av_dlog()
  flashsvenc: whitespace cosmetics
  flashsvenc: drop some unnecessary parentheses
  flashsvenc: fix some comment typos
  aacps: skip some memcpy() if src and dst would be equal
  ...

Conflicts:
	libavcodec/vaapi_mpeg2.c
	libavformat/aviobuf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-16 19:43:35 +02:00
Diego Biurrun
356be9307c Remove unused structs and tables. 2011-07-16 01:08:31 +02:00
Michael Niedermayer
6cbe81999b Merge remote-tracking branch 'qatar/master' 
* qatar/master: (28 commits)
  Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().
  x86: cabac: fix register constraints for 32-bit mode
  cabac: move x86 asm to libavcodec/x86/cabac.h
  x86: h264: cast pointers to intptr_t rather than int
  x86: h264: remove hardcoded edi in decode_significance_8x8_x86()
  x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86()
  x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86()
  x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86()
  x86: cabac: change 'a' constraint to 'r' in get_cabac_inline()
  x86: cabac: remove hardcoded esi in get_cabac_inline()
  x86: cabac: remove hardcoded edx in get_cabac_inline()
  x86: cabac: remove unused macro parameter
  x86: cabac: remove hardcoded ebx in inline asm
  x86: cabac: remove hardcoded struct offsets from inline asm
  cabac: remove inline asm under #if 0
  cabac: remove BRANCHLESS_CABAC_DECODER switch
  cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED
  document libswscale bump
  error_resilience: skip last-MV predictor step if MVs are not available.
  error_resilience: actually add counter when adding a MV predictor.
  ...

Conflicts:
	Changelog
	libavcodec/error_resilience.c
	libavfilter/defaults.c
	libavfilter/vf_drawtext.c
	libswscale/swscale.h
	tests/ref/vsynth1/error
	tests/ref/vsynth2/error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 03:38:25 +02:00
Mans Rullgard
8fcc0e7978 cabac: remove BRANCHLESS_CABAC_DECODER switch 
The code does not compile without this set.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-20 22:36:29 +01: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 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
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
Diego Biurrun
64bde1974b cosmetics: Rename prn variable to prng (Pseudo Random Number Generator). 
Originally committed as revision 18422 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-10 17:23:38 +00:00
Diego Biurrun
294eaa2643 Replace random() usage in test programs by av_lfg_*(). 
Originally committed as revision 18070 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-20 11:48:27 +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
Diego Biurrun
245976da2a Use full path for #includes from another directory. 
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:56:36 +00:00
Diego Biurrun
07ad12ecdd Fix test program compilation: Add missing #include and update the call 
of ff_init_cabac_states() to account for API changes.

Originally committed as revision 11602 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-23 10:23:24 +00:00
Diego Biurrun
07e4e3ea8b Consistently use TEST as the preprocessor condition to enable test code. 
Originally committed as revision 11581 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-20 23:53:51 +00:00
Diego Biurrun
f8a80fd69d main() --> main(void) 
Originally committed as revision 11079 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-23 00:52:56 +00:00
Panagiotis Issaris
d04d5bcd0e Fix the self tests which are contained in some codecs and are using random(). 
Originally committed as revision 9755 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-19 08:47:07 +00:00
Diego Biurrun
e5a389a1b7 license header consistency cosmetics 
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-05 10:40:25 +00:00
Jindřich Makovička
a0f2c6ba38 Kill a warning with MSVC 
Patch by Jindrich Makovicka makovick A gmail P com
Original thread:
Date: 08:21 AM
Subject Re: [Ffmpeg-devel] Weird line in cabac.h

Originally committed as revision 6726 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-18 09:37:25 +00:00
Michael Niedermayer
f24a515931 shift CABACContext.range right, this reduces the number of shifts needed in get_cabac() and is slightly faster on P3 (and should be much faster on P4 as the P4 except the more recent variants lacks an integer shifter and so shifts have ~10 times longer latency then simple operations like adds) 
Originally committed as revision 6702 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-15 20:40:50 +00:00
Michael Niedermayer
68a205edef dehack *ps_state indexing in the branchless decoder 
Originally committed as revision 6683 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-13 14:21:25 +00:00
Michael Niedermayer
d61c4e731e make state transition tables global as they are constant and the code is slightly faster that way 
Originally committed as revision 6655 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-11 14:44:17 +00:00
Michael Niedermayer
0fa352c7e6 make lps_range a global table its constant anyway (saves 1 addition for accessing it) 
Originally committed as revision 6653 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-11 13:21:42 +00:00
Diego Biurrun
0bc2e7f081 BRANCHLESS_CABAD --> BRANCHLESS_CABAC_DECODER 
Originally committed as revision 6623 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-10 08:16:41 +00:00
Michael Niedermayer
7822e1c1ff reverse remainder of the failed attempt to optimize *state=c->mps_state[s] 
Originally committed as revision 6609 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-09 21:14:16 +00:00
Michael Niedermayer
2e1aee80f4 optimize branchless C CABAC decoder 
Originally committed as revision 6607 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-09 20:44:11 +00:00
Michael Niedermayer
c010d69a75 decrease ff_h264_norm_shift[] size 
Originally committed as revision 6596 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-09 00:59:42 +00:00
Michael Niedermayer
260ceb6322 branchless renormalization (1% faster get_cabac) old branchless renormalization wasnt faster because gcc was scared of the shift variable (missusing bit variable now) 
Originally committed as revision 6587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-08 13:20:22 +00:00
Michael Niedermayer
99ce10873d 5% faster get_cabac() 
Originally committed as revision 6586 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-08 11:24:37 +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
6041c21749 fixing selftest 
Originally committed as revision 3820 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-11 03:18:08 +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
ec7eb8966c optimization 
Originally committed as revision 3639 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-10-26 03:12:21 +00:00
Michael Niedermayer
bba8334965 overread fix 
Originally committed as revision 3294 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-07-08 00:53:21 +00:00
Michael Niedermayer
e96682e6f4 some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>) 
Originally committed as revision 3140 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-05-18 17:09:46 +00:00
Laurent Aimar
e5017ab870 h264 - progressive I frame CABAC support patch by (Laurent Aimar <fenrir at via dot ecp dot fr>) 
Originally committed as revision 2932 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-03-26 19:35:53 +00:00
Alex Beregszaszi
ed7debda14 removed the obsolete and unused parameters of init_put_bits 
Originally committed as revision 2366 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-10-12 21:25:00 +00:00
Michael Niedermayer
5e20f836b3 FFV1 codec (our very simple lossless intra only codec, compresses much better then huffyuv) 
Originally committed as revision 1939 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-06-09 02:24:51 +00:00
Michael Niedermayer
8f8c0800f8 cleanup 
Originally committed as revision 1932 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-06-06 10:04:15 +00:00
Michael Niedermayer
61ccfcc009 (truncated) unary binerization 
unary k-th order exp golomb binarization

Originally committed as revision 1920 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-05-30 01:05:48 +00:00
Michael Niedermayer
d592f67fb6 CABAC 
note, this is just the CABAC (de)coder not complete h264-cabac support

Originally committed as revision 1915 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2003-05-28 18:44:52 +00:00