generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,945 Commits 24 Branches 241 Tags 173 MiB
02aabd820f
Commit Graph

25 Commits

Author SHA1 Message Date
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
Mans Rullgard
1765aacb17 hwaccel: unbreak build 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-07-10 23:58:26 +01:00
Carl Eugen Hoyos
a4ab70f92e ffmpeg: Fix VDPAU decoding for some H264 samples. 2011-07-04 00:02:37 -07:00
Carl Eugen Hoyos
e747b091cb Fix VDPAU decoding for some H264 samples. 2011-06-27 09:26:48 +02:00
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
Stefano Sabatini
ce5e49b0c2 replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* 2011-05-02 16:41:41 +02:00
Stefano Sabatini
975a1447f7 Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*. 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-05-02 12:18:44 +02:00
Reimar Döffinger
9b7a0c5d88 Allow selecting VDPAU, XvMC via get_format for MPEG-2 
To avoid further special-casing, dummy AVHWAccels are added
for VDPAU.
It should be possible to move VDPAU completely to AVHWAccel later.
 2011-04-01 19:13:24 +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
Stephen Warren
3bccd93ac0 Set VDPAU H264 picture parameter field_order_cnt and frame_num at the 
start of decoding a picture instead of at the end.
Fixes mmco01.264

Patch by Stephen Warren

Originally committed as revision 22728 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 08:10:29 +00:00
Stephen Warren
e5efbafdfd Fix VDPAU for H.264 streams with long reference frames. 
Patch by Stephen Warren.

Originally committed as revision 22727 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 07:52:44 +00:00
Carl Eugen Hoyos
66b50bc0b2 Cosmetics: Fix a comment. 
Originally committed as revision 22533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-14 23:52:45 +00:00
Carl Eugen Hoyos
741a17e6b4 Support B-frames when decoding MPEG-4 with VDPAU hardware acceleration. 
Based on a patch by NVIDIA.

Originally committed as revision 22160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-03 00:09:57 +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
Stephen Warren
49caac2413 Fix H.264 bitstream field log2_max_pic_order_cnt_lsb_minus4 
if sps.poc_type == 0.

Patch by Stephen Warren, swarren nvidia com

Originally committed as revision 17854 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-06 08:03:26 +00:00
NVIDIA Corporation
2f9c978a07 Do not set h264.is_reference for pictures that are delayed, but not 
actually reference frames.

Patch by NVIDIA

Originally committed as revision 17596 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-26 01:03:01 +00:00
NVIDIA Corporation
f90b55166e The field rangered in VDPAU's VdpPictureInfoVC1 now also contains 
rangeredfrm (VC-1 7.1.13) in bit 1.

Patch by NVIDIA

Originally committed as revision 17595 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-26 00:29:01 +00:00
Reimar Döffinger
d46b2d682f 100l, always declare variables at the top of a block, not inside a for () 
Originally committed as revision 17541 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-23 14:02:11 +00:00
Reimar Döffinger
9bbf1a5c23 Instead of crashing, return from ff_vdpau_mpeg_picture_complete() 
if get_buffer() failed.

Patch by Reimar

Originally committed as revision 17427 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-18 09:21:29 +00:00
Stephen Warren
ef7ae94ba2 Fix MBAFF/PAFF samples. 
Patch by Stephen Warren, swarren nvidia com

Originally committed as revision 17401 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-17 23:30:07 +00:00
Reimar Döffinger
06aae1238f Place spaces consistently in pointer types in vdpau.c 
Originally committed as revision 17320 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-15 12:31:01 +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
Diego Biurrun
9b4cfc360a Rename vdpauvideo.c --> vdpau.c and xvmcvideo.c --> xvmc.c to better fit 
the general libavcodec naming structure.

Originally committed as revision 17152 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-11 12:01:59 +00:00