RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
41,943 Commits 36 Branches 392 Tags 249 MiB
Commit Graph

10 Commits

Author SHA1 Message Date
Michael Niedermayer bf8bb94322 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ffmpeg: get rid of the -vglobal option.
  dct32: Add AVX implementation of 32-point DCT
  dct32: Change pass 6 permutation to allow for AVX implementation
  dct32: port SSE 32-point DCT to YASM
  multiple inclusion guard cleanup
  avio: document buffer must created with av_malloc() and friends
  avio: check AVIOContext malloc failure
  swscale: point out an alternative to sws_getContext
  svq3: Do initialization after parsing the extradata
  add changelog entries for 0.7_beta2
  mp3lame: add #include required for AV_RB32 macro.

Conflicts:
	Changelog
	libavcodec/svq3.c
	libavcodec/x86/dct32_sse.c
	libavfilter/vsrc_buffer.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-22 04:53:19 +02:00
Diego Biurrun 153382e1b6 multiple inclusion guard cleanup 
Add missing multiple inclusion guards; clean up #endif comments;
add missing library prefixes; keep guard names consistent.
 2011-05-21 13:48:10 +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
Peter Ross 07e6384dd8 Add doxygen @file comment block 
Originally committed as revision 24326 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-19 11:50:07 +00:00
Peter Ross 7199c3a4e2 Add @file documentation tag 
Originally committed as revision 24298 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-18 07:52:47 +00:00
Peter Ross 9e5f3dfe25 Add ff_draw_pc_font() 
Originally committed as revision 24296 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-18 07:44:38 +00:00
Peter Ross ddf9dc453f Add ff_vga16_font 
Originally committed as revision 24295 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-18 07:42:15 +00:00
Peter Ross b995a6a84f Add ff_ega_palette 
Originally committed as revision 23530 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-08 11:42:21 +00:00
Diego Biurrun b06da1725a Add missing stdint.h #include to fix 'make checkheaders'. 
Originally committed as revision 19484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-22 15:11:00 +00:00
Daniel Verkamp 89cb5cd25d Add CGA and palette data for 8088flex TMV decoder. 
Patch by Daniel Verkamp  daniel _AT_ drv DOT nu.

Originally committed as revision 18764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-06 21:51:58 +00:00