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
40,624 Commits 37 Branches 400 Tags 460 MiB
f153dfc9e4
Commit Graph

31 Commits

Author SHA1 Message Date
Michael Niedermayer
92ef4be4ab Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ARM: allow runtime masking of CPU features
  dsputil: remove unused functions
  mov: Treat keyframe indexes as 1-origin if starting at non-zero.
  mov: Take stps entries into consideration also about key_off.
  Remove lowres video decoding

Conflicts:
	ffmpeg.c
	ffplay.c
	libavcodec/arm/vp8dsp_init_arm.c
	libavcodec/libopenjpegdec.c
	libavcodec/mjpegdec.c
	libavcodec/mpegvideo.c
	libavcodec/utils.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-22 22:26:42 +02:00
Mans Rullgard
2bcbd98459 Remove lowres video decoding 
This feature is complex, of questionable utility, and slows down
normal decoding.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-04-21 18:56:19 +01:00
Michael Niedermayer
6cb2085278 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (27 commits)
  ppc: Add ff_ prefix to nonstatic symbols
  sh4: Add ff_ prefix to nonstatic symbols
  mpegvideo: Add ff_ prefix to nonstatic functions
  rtjpeg: Add ff_ prefix to nonstatic symbols
  rv: Add ff_ prefix to nonstatic symbols
  vp56: Add ff_ prefix to nonstatic symbols
  vorbis: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefix to nonstatic symbols
  vc1: Add ff_ prefix to nonstatic symbols
  msmpeg4: Add ff_ prefixes to nonstatic symbols
  snow: Add ff_ prefix to nonstatic symbols
  mpeg12: Add ff_ prefix to nonstatic symbols
  mpeg4: Add ff_ prefixes to nonstatic symbols
  lagarith: Add ff_ prefix to lag_rac_init
  libavcodec: Add ff_ prefix to j_rev_dct*
  dsputil: Add ff_ prefix to inv_zigzag_direct16
  libavcodec: Prefix fdct_ifast, fdct_ifast248
  dsputil: Add ff_ prefix to the dsputil*_init* functions
  libavcodec: Add ff_ prefix to some nonstatic symbols
  vlc/rl: Add ff_ prefix to the nonstatic symbols
  ...

Conflicts:
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/dnxhddec.c
	libavcodec/ffv1.c
	libavcodec/h263.h
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/nuv.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/proresdsp.c
	libavcodec/svq3.c
	libavcodec/version.h
	libavformat/dv.h
	libavformat/dvenc.c
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-02-16 01:34:37 +01:00
Martin Storsjö
5f2c159c0f vc1: Add ff_ prefix to nonstatic symbols 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:07:05 +02:00
Martin Storsjö
1fec055066 msmpeg4: Add ff_ prefixes to nonstatic symbols 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-02-15 22:07:01 +02:00
Michael Niedermayer
3ba0bfe71f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ulti: Fix invalid reads
  lavf: dealloc private options in av_write_trailer
  yadif: support 10bit YUV
  vc1: mark with ER_MB_ERROR bits overconsumption
  lavc: introduce ER_MB_END and ER_MB_ERROR
  error_resilience: use the ER_ namespace
  build: move inclusion of subdir.mak to main subdir loop
  rv34: NEON optimised 4x4 dequant
  rv34: move 4x4 dequant to RV34DSPContext
  aacdec: Use intfloat.h rather than local punning union.

Conflicts:
	libavcodec/h264.c
	libavcodec/vc1dec.c
	libavfilter/vf_yadif.c
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-13 23:21:37 +01:00
Luca Barbato
63ccd46687 lavc: introduce ER_MB_END and ER_MB_ERROR 
Simplify a little error resilience calls

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-13 16:20:58 +01:00
Luca Barbato
5bf2ac2b37 error_resilience: use the ER_ namespace 
Add the namespace to {AC_,DC_,MV_}{END,ERROR} macros

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-13 16:20:58 +01:00
Michael Niedermayer
e10979ff56 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  changelog: misc typo and wording fixes
  H.264: add filter_mb_fast support for >8-bit decoding
  doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
  lls: use av_lfg instead of rand() in test program
  build: remove unnecessary dependency on libs from 'all' target
  H.264: avoid redundant alpha/beta calculations in loopfilter
  H.264: optimize intra/inter loopfilter decision
  mpegts: fix Continuity Counter error detection
  build: remove unnecessary FFLDFLAGS variable
  vp8/mt: flush worker thread, not application thread context, on seek.
  mt: proper locking around release_buffer calls.
  DxVA2: unbreak build after [657ccb5ac7]
  hwaccel: unbreak build
  Eliminate FF_COMMON_FRAME macro.

Conflicts:
	Changelog
	Makefile
	doc/developer.texi
	libavcodec/avcodec.h
	libavcodec/h264.c
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-12 01:42:32 +02:00
Diego Biurrun
657ccb5ac7 Eliminate FF_COMMON_FRAME macro. 
FF_COMMON_FRAME holds the contents of the AVFrame structure and is also copied
to struct Picture.  Replace by an embedded AVFrame structure in struct Picture.
 2011-07-11 00:19:00 +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 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
Reimar Döffinger
2f9bbdd25c Change VLC table creation in x8_vlc_init to use INIT_VLC_USE_NEW_STATIC. 
Originally committed as revision 20011 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 11:04: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
Michael Niedermayer
1b923aa44a Two INIT_VLC_USE_STATIC cases Carl missed. 
Originally committed as revision 18438 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-11 14:16:30 +00:00
Carl Eugen Hoyos
e161e007be Use INIT_VLC_USE_STATIC and not its value "1". 
Originally committed as revision 18430 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-11 11:47:15 +00:00
Alex Converse
5363c43ea8 Add av_cold attributes to *_init and *_end functions. 
Originally committed as revision 16980 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-03 23:09:00 +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
c47d146be8 Add missing 'void' keyword to parameterless function declarations. 
Originally committed as revision 16436 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-05 13:57:43 +00:00
Loren Merritt
5fecfb7d58 clear_block mmx 
Originally committed as revision 16045 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-10 21:35:17 +00:00
Zdenek Kabelac
e2fdba650d Correctly clean up IntraX8Context upon codec close. 
patch by Zdenek Kabelac, zdenek d kabelac a gmail d com

Originally committed as revision 11608 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-25 07:37:46 +00:00
Diego Biurrun
8a43317e66 cosmetics: Fix spacial --> spatial typo in function names. 
Originally committed as revision 10993 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-10 12:24:02 +00:00
Diego Biurrun
c238beb5d7 misc spelling/grammar/wording fixes in comments 
Originally committed as revision 10991 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-10 11:51:56 +00:00
Aurelien Jacobs
ce038da040 make some tables static 
Originally committed as revision 10987 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-10 01:02:36 +00:00
Michael Niedermayer
cb0d8a5f8f grammar 
Originally committed as revision 10985 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-09 22:15:46 +00:00
Michael Niedermayer
3358e879d2 indention 
Originally committed as revision 10984 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-09 22:05:29 +00:00
Michael Niedermayer
dc6e492bb2 remove inline from non speed critical functions 
Originally committed as revision 10982 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-09 21:58:50 +00:00
Michael Niedermayer
b7f435b058 vertical align 
Originally committed as revision 10981 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-09 21:56:18 +00:00
Michael Niedermayer
149ad67792 indention 
Originally committed as revision 10980 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-09 21:55:53 +00:00
Michael Niedermayer
d25300b79f remove unneeded {} 
Originally committed as revision 10979 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-09 21:55:33 +00:00
Michael Niedermayer
9abc7e0fdc intrax8 decoder patch by "someone" 
Originally committed as revision 10971 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-09 21:37:48 +00:00