summaryrefslogtreecommitdiff
path: root/libavcodec/vdpau.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-241-2/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: adpcm: use sign_extend() mpeg12: fix mpeg_decode_slice context parameter type Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context" Conflicts: libavcodec/mpeg12.c libavcodec/mpeg12.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context"Janne Grunau2011-10-241-4/+3
| | | | | | | | | | | | | | | | This reverts commit da22ba7df461c13bf0b0eabc953303803a285d91 since it broke slice threading. Slice threading just duplicates MpegEncContext so every value used during mpeg_decode_slice has to be in it. A second patch will fix the illusion that Mpeg1Context is available in mpeg_decode_slice.
* | Revert "mpeg12: move full_pel from MpegEncContext to Mpeg1Context"Michael Niedermayer2011-10-241-2/+2
| | | | | | | | | | | | | | | | | | This reverts commit da22ba7df461c13bf0b0eabc953303803a285d91. Conflicts: libavcodec/mpeg12.c libavcodec/mpeg12.h
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-241-3/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Move id3v2 tag writing to a separate file. swscale: add missing colons to x86 assembly yuv2planeX. g722: split decoder and encoder into separate files cosmetics: remove extra spaces before end-of-statement semi-colons vorbisdec: check output buffer size before writing output wavpack: calculate bpp using av_get_bytes_per_sample() ac3enc: Set max value for mode options correctly lavc: move get_b_cbp() from h263.h to mpeg4videoenc.c mpeg12: move closed_gop from MpegEncContext to Mpeg1Context mpeg12: move full_pel from MpegEncContext to Mpeg1Context mpeg12: move Mpeg1Context from mpeg12.c to mpeg12.h mpegvideo: remove some unused variables from MpegEncContext. Conflicts: libavcodec/mpeg12.c libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12: move full_pel from MpegEncContext to Mpeg1ContextAnton Khirnov2011-10-231-3/+4
| | | | | | | | It's MPEG-1 specific.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-121-20/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 [657ccb5ac75ce34e62bd67f228d9bd36db72189e] 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>
| * hwaccel: unbreak buildMans Rullgard2011-07-101-20/+20
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * ffmpeg: Fix VDPAU decoding for some H264 samples.Carl Eugen Hoyos2011-07-041-1/+2
| |
* | Fix VDPAU decoding for some H264 samples.Carl Eugen Hoyos2011-06-271-1/+2
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-241-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * doxygen: Consistently use '@' instead of '\' for Doxygen markup.Diego Biurrun2011-06-241-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.Stefano Sabatini2011-05-021-6/+6
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*Stefano Sabatini2011-05-021-6/+6
| |
* | Allow selecting VDPAU, XvMC via get_format for MPEG-2Reimar Döffinger2011-04-011-0/+36
|/ | | | | | To avoid further special-casing, dummy AVHWAccels are added for VDPAU. It should be possible to move VDPAU completely to AVHWAccel later.
* Set VDPAU H264 picture parameter field_order_cnt and frame_num at theStephen Warren2010-03-301-6/+16
| | | | | | | | | 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
* Fix VDPAU for H.264 streams with long reference frames.Stephen Warren2010-03-301-1/+1
| | | | | | Patch by Stephen Warren. Originally committed as revision 22727 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics: Fix a comment.Carl Eugen Hoyos2010-03-141-1/+1
| | | | Originally committed as revision 22533 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Support B-frames when decoding MPEG-4 with VDPAU hardware acceleration.Carl Eugen Hoyos2010-03-031-0/+4
| | | | | | Based on a patch by NVIDIA. Originally committed as revision 22160 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add VDPAU hardware accelerated decoding for MPEG-4 ASP which can be usedNVIDIA Corporation2009-11-101-0/+50
| | | | | | | | by video players. Original patch by NVIDIA corporation. Originally committed as revision 20502 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix H.264 bitstream field log2_max_pic_order_cnt_lsb_minus4Stephen Warren2009-03-061-1/+1
| | | | | | | | if sps.poc_type == 0. Patch by Stephen Warren, swarren nvidia com Originally committed as revision 17854 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not set h264.is_reference for pictures that are delayed, but notNVIDIA Corporation2009-02-261-1/+1
| | | | | | | | actually reference frames. Patch by NVIDIA Originally committed as revision 17596 to svn://svn.ffmpeg.org/ffmpeg/trunk
* The field rangered in VDPAU's VdpPictureInfoVC1 now also containsNVIDIA Corporation2009-02-261-1/+1
| | | | | | | | rangeredfrm (VC-1 7.1.13) in bit 1. Patch by NVIDIA Originally committed as revision 17595 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 100l, always declare variables at the top of a block, not inside a for ()Reimar Döffinger2009-02-231-1/+2
| | | | Originally committed as revision 17541 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Instead of crashing, return from ff_vdpau_mpeg_picture_complete()Reimar Döffinger2009-02-181-0/+2
| | | | | | | | if get_buffer() failed. Patch by Reimar Originally committed as revision 17427 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix MBAFF/PAFF samples.Stephen Warren2009-02-171-1/+1
| | | | | | Patch by Stephen Warren, swarren nvidia com Originally committed as revision 17401 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Place spaces consistently in pointer types in vdpau.cReimar Döffinger2009-02-151-17/+17
| | | | Originally committed as revision 17320 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Revert adding a _pixfmt to vdpau/xvmc header names.Diego Biurrun2009-02-141-1/+1
| | | | | | Since vdpau.h was an installed header this would break API. Originally committed as revision 17225 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename xvmc_render.h --> xvmc_pixfmt.h and vdpau.h --> vdpau_pixfmt.h asDiego Biurrun2009-02-121-1/+1
| | | | | | 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
* Rename vdpauvideo.c --> vdpau.c and xvmcvideo.c --> xvmc.c to better fitDiego Biurrun2009-02-111-0/+305
the general libavcodec naming structure. Originally committed as revision 17152 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status