RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
33,886 Commits 37 Branches 400 Tags 271 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 032f406864 Handle input or output len of 0 properly in lzo decoder. 
(cherry picked from commit 7d5082600e)
 2011-01-24 21:25:43 +01:00
Reimar Döffinger 7d5082600e Handle input or output len of 0 properly in lzo decoder. 2011-01-24 18:52:08 +01:00
Diego Biurrun 985fdd534f Give liblzo benchmark conditionals more descriptive names and add convenience 
definitions along with instructions for changing them.

Originally committed as revision 18387 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-09 15:11:48 +00:00
Diego Biurrun 82a6ef2089 Replace manual setting of the removed av_log_level variable by the 
corresponding call to av_log_set_level().

Originally committed as revision 18310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-02 08:15:03 +00:00
Reimar Döffinger fe4032b66a Remove more functions disabled by major version bump. 
Originally committed as revision 17876 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-08 15:02:12 +00:00
Diego Biurrun 0d08e27015 Add necessary header for LIBAVUTIL_VERSION_MAJOR, fixes the warning: 
libavutil/lzo.c:235:5: warning: "LIBAVUTIL_VERSION_MAJOR" is not defined

Originally committed as revision 16962 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 23:13:18 +00:00
Reimar Döffinger a545f067f3 Move doxygen documentation from lzo.c to lzo.h 
Originally committed as revision 16949 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 20:30:36 +00:00
Reimar Döffinger 0b178e5629 Add av_ prefix to LZO stuff and thus make it officially part of the public API. 
Keep lzo1x_decode until the next major version bump for binary compatibility.

Originally committed as revision 16946 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 20:16:00 +00:00
Diego Biurrun bfe3676feb spelling/grammar/consistency review part II 
Originally committed as revision 16848 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-28 23:03:17 +00:00
Diego Biurrun 89c9ff504b spelling/grammar/consistency review part I 
Originally committed as revision 16840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-28 00:16:05 +00:00
Peter Ross 6ba10f338a Add av_memcpy_backptr(): deliberately overlapping memcpy variant. 
Originally committed as revision 14641 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-06 08:17:03 +00:00
Reimar Döffinger 5e038b4f08 LZO decoder input is const 
Originally committed as revision 11797 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 16:30:51 +00:00
Reimar Döffinger 4302963daa Move lzo decompression to libavutil 
Originally committed as revision 7789 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-31 22:58:53 +00:00