RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
36,918 Commits 36 Branches 398 Tags 225 MiB
Commit Graph

17 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
Carl Eugen Hoyos ddb00ad1d8 Move the info union to the end of the vdpau_render_state struct. 2011-04-20 09:44:08 +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 3c042da75d Remove stray Doxygen grouping command; fixes one Doxygen warning. 
Originally committed as revision 23996 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-02 13:00:18 +00:00
Carl Eugen Hoyos 830628e11c Cosmetics: Fix indentation. 
Originally committed as revision 20542 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-16 01:56:47 +00:00
NVIDIA Corporation 70e0c871eb Add VDPAU hardware accelerated decoding for MPEG-4 ASP which can be used 
by video players.

Original patch by NVIDIA corporation.

Originally committed as revision 20502 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-10 18:52:39 +00:00
Carl Eugen Hoyos 6d7d410f8b Clarify responsibility for freeing a buffer when using vdpau. 
Originally committed as revision 20376 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-27 08:30:50 +00:00
Diego Biurrun fd949a6353 Revert adding a _pixfmt to vdpau/xvmc header names. 
Since vdpau.h was an installed header this would break API.

Originally committed as revision 17225 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-14 13:37:18 +00:00
Diego Biurrun 8df3bf60cf Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h as 
suggested by Michael, the new names better describe the contents of the files.

Originally committed as revision 17168 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-12 01:00:46 +00:00
Carl Eugen Hoyos 0d9becc77c Sort VdpPictureInfo alphabetically. 
Originally committed as revision 16705 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-20 22:53:25 +00:00
NVIDIA Corporation c5b42f4a80 Add VDPAU hardware accelerated decoding for WMV3 and VC1 which can 
be used by video players.

Original patch by NVIDIA corporation.

Originally committed as revision 16699 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-20 09:28:36 +00:00
NVIDIA Corporation d37edddc09 Add VDPAU hardware accelerated decoding for MPEG1 and MPEG2 which can 
be used by video players.

Original patch by NVIDIA corporation.

Originally committed as revision 16628 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-16 02:14:07 +00:00
Carl Eugen Hoyos 6cc01c245f Rename bitstreamBuffers* as bitstream_buffers* 
Originally committed as revision 16491 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 23:42:07 +00:00
Diego Biurrun 25bd48bdb4 Use <> instead of "" for system headers. 
Originally committed as revision 16480 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 18:24:16 +00:00
Carl Eugen Hoyos 373745ae62 1l: Forgot to rename header guard. 
Originally committed as revision 16448 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-06 10:13:25 +00:00
Carl Eugen Hoyos 8423186e65 Rename vdpau_render.h as vdpau.h. 
Originally committed as revision 16444 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-05 23:23:32 +00:00