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

16 Commits

Author SHA1 Message Date
Michael Niedermayer 686959e87e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doxygen: Consistently use '@' instead of '\' for Doxygen markup.
  Use av_printf_format to check the usage of printf style functions
  Add av_printf_format, for marking printf style format strings and their parameters
  ARM: enable thumb for Cortex-M* CPUs
  nsvdec: Propagate error values instead of returning 0 in nsv_read_header().
  build: remove SRC_PATH_BARE variable
  build: move basic rules and variables to main Makefile
  build: move special targets to end of main Makefile
  lavdev: improve feedback in case of invalid frame rate/size
  vfwcap: prefer "framerate_q" over "fps" in vfw_read_header()
  v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters()
  fbdev: prefer "framerate_q" over "fps" in device context
  bktr: prefer "framerate" over "fps" for grab_read_header()
  ALSA: implement channel layout for playback.
  alsa: support unsigned variants of already supported signed formats.
  alsa: add support for more formats.
  ARM: allow building in Thumb2 mode

Conflicts:
	common.mak
	doc/APIchanges
	libavcodec/vdpau.h
	libavdevice/alsa-audio-common.c
	libavdevice/fbdev.c
	libavdevice/libdc1394.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-24 03:07:04 +02:00
Diego Biurrun adbfc605f6 doxygen: Consistently use '@' instead of '\' for Doxygen markup. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-06-24 00:37:49 +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
Reimar Döffinger bc17cc01ed Add support for 3DES to DES module 
Originally committed as revision 16971 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-03 16:45:42 +00:00
Reimar Döffinger 1a534c7f1e Add and use a public API for RC4 and DES, analogous to the AES API. 
Originally committed as revision 16970 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-03 14:20:55 +00:00
Diego Biurrun 7d685b486b spelling/grammar/consistency review part III 
Originally committed as revision 16849 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-28 23:16:49 +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
Måns Rullgård 3540b950ec add missing #include "common.h" to libavutil headers 
Originally committed as revision 12502 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-19 08:47:31 +00:00
Zuxy Meng 85074d3c93 Reapply r12489: Add pure, const and malloc attributes to proper functions 
in libavutil.
Fix a compilation failure in r12489.

Originally committed as revision 12498 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-19 06:17:43 +00:00
Benoit Fouet 2119bb8f51 revert r12489. 
Originally committed as revision 12490 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-18 16:29:47 +00:00
Zuxy Meng 6544f48f03 Pure, const and malloc attributes to libavutil. 
Patch by Zuxy Meng: zuxy meng gmail com
Original thread:
[FFmpeg-devel] [PATCH] Pure, const and malloc attributes to libavutil
Date: 03/18/2008 6:09 AM

Originally committed as revision 12489 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-18 15:27:15 +00:00
Peter Ross fe0c188b4a This header just needs stdint.h, not inttypes.h, which is a superset of 
stdint.h.  This has the sideeffect of fixing the build on Interix.
patch by Pete Ross, pross xvid org

Originally committed as revision 12225 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-26 09:12:55 +00:00
Diego Biurrun f0a838e525 Add missing #includes to fix 'make checkheaders'. 
Originally committed as revision 11087 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-24 10:08:02 +00:00
Reimar Döffinger 46fb896b9d Document ff_des_encdec 
Originally committed as revision 10822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-20 14:45:07 +00:00
Diego Biurrun 1b1ab19816 cosmetics: Add #endif comment. 
Originally committed as revision 10811 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-19 09:54:16 +00:00
Reimar Döffinger 2e9ad69aaf Add support for DES en- and decryption. 
Originally committed as revision 10810 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-19 09:31:41 +00:00