summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/vda_h264: fix null pointer dereferenceMichael Niedermayer2014-05-121-3/+5
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '67afcefb35932b420998f6f3fda46c7c85848a3f'Michael Niedermayer2014-05-128-7/+415
|\ | | | | | | | | | | | | | | | | | | | | | | * commit '67afcefb35932b420998f6f3fda46c7c85848a3f': lavc: Add new VDA hwaccel Conflicts: configure libavcodec/vda.h libavcodec/vda_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Add new VDA hwaccelAnton Khirnov2014-05-118-7/+414
| | | | | | | | | | | | | | | | | | It leverages the new hwaccel 1.2 features: - get_buffer2 is never called - the internal context is automatically initialized/deinitialized Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '31a46750c7eafe6bce6a3e4f09853cd0a585292b'Michael Niedermayer2014-05-122-27/+38
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '31a46750c7eafe6bce6a3e4f09853cd0a585292b': vda: use hwaccel private data for internal bitstream buffer Conflicts: libavcodec/vda.h libavcodec/vda_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vda: use hwaccel private data for internal bitstream bufferAnton Khirnov2014-05-112-18/+38
| |
* | Merge commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f'Michael Niedermayer2014-05-124-1/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '66e6c8a7b4e3ac926302529606bd3e323c28b20f': lavu: Add a pixel format for new VDA hwaccel Conflicts: doc/APIchanges libavutil/pixfmt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: Add a pixel format for new VDA hwaccelAnton Khirnov2014-05-114-1/+9
| | | | | | | | | | The current hwaccel is broken and cannot be fixed in a compatible way. It will be deprecated and replaced with a new one.
* | Merge commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8'Michael Niedermayer2014-05-124-4/+59
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8': lavc: Add hwaccel private data and init/uninit callbacks Conflicts: libavcodec/avcodec.h libavcodec/internal.h libavcodec/pthread_frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Add hwaccel private data and init/uninit callbacksAnton Khirnov2014-05-114-4/+59
| |
* | Merge commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436'Michael Niedermayer2014-05-122-2/+14
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436': hwaccel: Support specific frame allocators Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hwaccel: Support specific frame allocatorsLuca Barbato2014-05-112-0/+12
| | | | | | | | It would reduce the boilerplate code users have to write.
* | Merge commit 'a871ef0cc936612bdb0e643196be72efcf0c8986'Michael Niedermayer2014-05-1110-17/+17
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'a871ef0cc936612bdb0e643196be72efcf0c8986': hwaccel: Rename priv_data_size to frame_priv_data_size Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hwaccel: Rename priv_data_size to frame_priv_data_sizeAnton Khirnov2014-05-1110-17/+17
| | | | | | | | This describes more accurately what this field is for.
* | Merge commit '08bb2567586599d62a282c4cd31567a0807f3d92'Michael Niedermayer2014-05-111-0/+7
|\ \ | |/ | | | | | | | | | | * commit '08bb2567586599d62a282c4cd31567a0807f3d92': lavc: document which parts of AVHWAccel are private. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: document which parts of AVHWAccel are private.Anton Khirnov2014-05-111-0/+7
| |
* | Merge commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f'Michael Niedermayer2014-05-116-29/+33
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f': lavc: set AVCodecContext.hwaccel in ff_get_format() Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: set AVCodecContext.hwaccel in ff_get_format()Anton Khirnov2014-05-116-30/+33
| | | | | | | | This way each decoder does not have to do the same thing manually.
* | Merge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425'Michael Niedermayer2014-05-116-5/+17
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425': lavc: Add an internal wrapper around get_format() Conflicts: libavcodec/h264_slice.c libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Add an internal wrapper around get_format()Anton Khirnov2014-05-117-10/+22
| | | | | | | | It will be useful in the following commits.
* | avcodec/dct: use av_malloc_array()Michael Niedermayer2014-05-111-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/cinepakenc: use av_malloc_array()Michael Niedermayer2014-05-111-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: Fix floating point conformance ith icl.Matt Oliver2014-05-111-2/+2
| | | | | | | | | | Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/on2avc: silent warnings about const paramsLukasz Marek2014-05-111-2/+2
| | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: fix minor typo in omit_video_pes_length descriptionAman Gupta2014-05-111-1/+1
| | | | | | | | | | Signed-off-by: Aman Gupta <ffmpeg@tmm1.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libmpcodecs/vf_uspp: check avcodec_open() return codemichael2014-05-111-1/+2
| | | | | | | | | | | | Fixes CID1135747 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffserver: don't leak poll_table if poll failsReynaldo H. Verdejo Pinochet2014-05-101-1/+3
| | | | | | | | | | | | Should fix Coverity Scan issue #732265 Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
* | Add missing "const" to pointer arrays.Reimar Döffinger2014-05-102-20/+20
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | avfilter/vf_removelogo: fix memleak on failureMichael Niedermayer2014-05-101-2/+6
| | | | | | | | | | | | Fixes CID751770 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevcdsp: include stddef.h for ptrdiff_t definitionJames Almer2014-05-101-0/+1
| | | | | | | | | | | | | | | | Including stdint.h was enough for systems like Mingw, but apparently not for Linux. This should fix make checkheaders failures on every platform Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | opencl: Make init_mtx static with volatile lockMatt Oliver2014-05-101-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hevcdsp: add missing header includeJames Almer2014-05-101-0/+2
| | | | | | | | | | | | | | Fixes make checkheaders Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vf_lut3d: check size in parse_dat()Michael Niedermayer2014-05-101-1/+6
| | | | | | | | | | | | Fixes CID1212261 Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: Check ff_put_wav_header() return codeMichael Niedermayer2014-05-101-2/+6
| | | | | | | | | | Fixes CID1212260 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Document smoothstreaming muxerAndrey Utkin2014-05-101-0/+22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: better level/index printingMatthew Lindner2014-05-092-4/+4
| |
* | avcodec: replace uses of deprecated avcodec_set_dimensions()Michael Niedermayer2014-05-092-4/+16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libmpcodecs: Fix compilation due to missing static in suncc.Matt Oliver2014-05-093-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9880a0d4b131ef36694d62f78060350a81f08b80'Michael Niedermayer2014-05-090-0/+0
|\ \ | |/ | | | | | | | | | | | | * commit '9880a0d4b131ef36694d62f78060350a81f08b80': pcm-dvd: Fix 20bit decoding See: 5db49fc38d9132e134de92584f296559bec3b789 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pcm-dvd: Fix 20bit decodingnu7742014-05-091-4/+4
| | | | | | | | | | | | | | | | Increment the pointer as needed. Bug-Id: 592 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | rtpdec: make the NTP time values unsigned.Diego Elio 'Flameeyes' Pettenò2014-05-091-2/+2
| | | | | | | | | | | | | | | | As per RFC3550, section 4, the NTP time is provided as 64-bit unsigned integer, so follow the same logic here. Reviewed-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: check for recent dxva2api headers with fixed COBJMACROS definesHendrik Leppkes2014-05-091-1/+12
| | | | | | | | | | | | This fixes build failures on older mingw chains (before 2012). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/hevc: Fix undefined shiftsMichael Niedermayer2014-05-091-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegaudiodec_template: make shift unsigned to avoid undefined behaviorMichael Niedermayer2014-05-091-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/x86/hevcdsp_init: fix build failure with --disable-mmxMichael Niedermayer2014-05-091-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg4videodec: print run/level/index valuesMichael Niedermayer2014-05-091-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: include GET_RL_VLC() in trace outputMichael Niedermayer2014-05-091-1/+21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | hvcodec/x86/hevcdsp: make macros more modular to support functions that are ↵plepere2014-05-092-302/+302
| | | | | | | | | | | | not sse4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/phase: make the main loop readable.Clément Bœsch2014-05-081-4/+9
| |
* | avfilter/phase: add some constness for RO data pointers.Clément Bœsch2014-05-081-5/+5
| |
* | avfilter/phase: add timeline support.Clément Bœsch2014-05-081-0/+10
| |
OpenPOWER on IntegriCloud