Michael Niedermayer
2ec4586d77
Merge commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8'
...
* 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>
2014-05-12 00:21:44 +02:00
Michael Niedermayer
c4fe50b954
Merge commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436'
...
* commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436':
hwaccel: Support specific frame allocators
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-12 00:06:35 +02:00
Michael Niedermayer
fa0f7c024e
Merge commit 'a871ef0cc936612bdb0e643196be72efcf0c8986'
...
* commit 'a871ef0cc936612bdb0e643196be72efcf0c8986':
hwaccel: Rename priv_data_size to frame_priv_data_size
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11 23:49:13 +02:00
Michael Niedermayer
8d19dd91a5
Merge commit '08bb2567586599d62a282c4cd31567a0807f3d92'
...
* commit '08bb2567586599d62a282c4cd31567a0807f3d92':
lavc: document which parts of AVHWAccel are private.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11 23:40:51 +02:00
Michael Niedermayer
f2f99f07a5
Merge commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f'
...
* commit '5c1d7246cd65dc4db1b6dc36e29ce39fc1068f3f':
lavc: set AVCodecContext.hwaccel in ff_get_format()
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11 23:28:40 +02:00
Michael Niedermayer
d93cf093f8
Merge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425'
...
* 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>
2014-05-11 21:48:32 +02:00
Michael Niedermayer
5e95551199
avcodec/dct: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11 20:06:45 +02:00
Michael Niedermayer
e2c7816ab0
avcodec/cinepakenc: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11 20:06:28 +02:00
Anton Khirnov
dd2d3b766b
lavc: Add hwaccel private data and init/uninit callbacks
2014-05-11 14:59:07 +02:00
Luca Barbato
ebc29519d1
hwaccel: Support specific frame allocators
...
It would reduce the boilerplate code users have to write.
2014-05-11 14:59:07 +02:00
Anton Khirnov
a871ef0cc9
hwaccel: Rename priv_data_size to frame_priv_data_size
...
This describes more accurately what this field is for.
2014-05-11 14:59:07 +02:00
Anton Khirnov
08bb256758
lavc: document which parts of AVHWAccel are private.
2014-05-11 14:59:07 +02:00
Anton Khirnov
5c1d7246cd
lavc: set AVCodecContext.hwaccel in ff_get_format()
...
This way each decoder does not have to do the same thing manually.
2014-05-11 14:59:07 +02:00
Anton Khirnov
632ad2248e
lavc: Add an internal wrapper around get_format()
...
It will be useful in the following commits.
2014-05-11 14:59:07 +02:00
Matt Oliver
efcea0b911
configure: Fix floating point conformance ith icl.
...
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11 13:57:00 +02:00
Lukasz Marek
ab57cbb7b1
lavc/on2avc: silent warnings about const params
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11 06:23:25 +02:00
Aman Gupta
72fed6d122
avformat/mpegtsenc: fix minor typo in omit_video_pes_length description
...
Signed-off-by: Aman Gupta <ffmpeg@tmm1.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11 03:20:00 +02:00
michael
04e140daa2
libmpcodecs/vf_uspp: check avcodec_open() return code
...
Fixes CID1135747
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11 02:13:28 +02:00
Reynaldo H. Verdejo Pinochet
e0877aa544
ffserver: don't leak poll_table if poll fails
...
Should fix Coverity Scan issue #732265
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
2014-05-10 18:16:19 -04:00
Reimar Döffinger
97bcb05889
Add missing "const" to pointer arrays.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-05-10 21:57:28 +02:00
Michael Niedermayer
6b9e0bf42f
avfilter/vf_removelogo: fix memleak on failure
...
Fixes CID751770
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-10 21:29:24 +02:00
James Almer
8e07800001
hevcdsp: include stddef.h for ptrdiff_t definition
...
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>
2014-05-10 18:23:30 +02:00
Matt Oliver
c6bf660bef
opencl: Make init_mtx static with volatile lock
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-10 15:07:33 +02:00
James Almer
fa23190a7a
hevcdsp: add missing header include
...
Fixes make checkheaders
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-10 14:55:03 +02:00
Michael Niedermayer
2e55f3e907
avfilter/vf_lut3d: check size in parse_dat()
...
Fixes CID1212261
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-10 14:46:58 +02:00
Michael Niedermayer
dc6b99d6b2
avformat/movenc: Check ff_put_wav_header() return code
...
Fixes CID1212260
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-10 03:51:49 +02:00
Andrey Utkin
8cc6e91f69
Document smoothstreaming muxer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-10 00:06:32 +02:00
Matthew Lindner
b372f67342
avcodec: better level/index printing
2014-05-09 22:05:57 +02:00
Michael Niedermayer
398e3a591f
avcodec: replace uses of deprecated avcodec_set_dimensions()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-09 19:43:30 +02:00
Matt Oliver
3554c2fafc
libmpcodecs: Fix compilation due to missing static in suncc.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-09 18:33:55 +02:00
Michael Niedermayer
8a21613821
Merge commit '9880a0d4b131ef36694d62f78060350a81f08b80'
...
* commit '9880a0d4b131ef36694d62f78060350a81f08b80':
pcm-dvd: Fix 20bit decoding
See: 5db49fc38d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-09 16:44:25 +02:00
nu774
9880a0d4b1
pcm-dvd: Fix 20bit decoding
...
Increment the pointer as needed.
Bug-Id: 592
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-05-09 16:07:15 +02:00
Diego Elio 'Flameeyes' Pettenò
a7b554f863
rtpdec: make the NTP time values unsigned.
...
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>
2014-05-09 15:10:57 +02:00
Hendrik Leppkes
bc47801968
configure: check for recent dxva2api headers with fixed COBJMACROS defines
...
This fixes build failures on older mingw chains (before 2012).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-09 14:18:05 +02:00
Michael Niedermayer
2201d1a0f8
avcodec/hevc: Fix undefined shifts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-09 13:34:12 +02:00
Michael Niedermayer
0be95996d0
avcodec/mpegaudiodec_template: make shift unsigned to avoid undefined behavior
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-09 13:17:39 +02:00
Michael Niedermayer
341cacb9ac
avcodec/x86/hevcdsp_init: fix build failure with --disable-mmx
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-09 05:16:27 +02:00
Michael Niedermayer
e54c052bee
avcodec/mpeg4videodec: print run/level/index values
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-09 02:03:54 +02:00
Michael Niedermayer
6df33c4926
avcodec: include GET_RL_VLC() in trace output
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-09 02:03:54 +02:00
plepere
63832e01c3
hvcodec/x86/hevcdsp: make macros more modular to support functions that are not sse4
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-09 00:14:50 +02:00
Clément Bœsch
5623a10526
avfilter/phase: make the main loop readable.
2014-05-08 23:58:34 +02:00
Clément Bœsch
5df10150d4
avfilter/phase: add some constness for RO data pointers.
2014-05-08 23:34:51 +02:00
Clément Bœsch
69d72140ac
avfilter/phase: add timeline support.
2014-05-08 23:34:51 +02:00
Clément Bœsch
8de600de55
avfilter/phase: avoid a memcpy per frame.
2014-05-08 22:59:47 +02:00
Clément Bœsch
687119aa9d
avfilter/phase: do not pass the whole context to analyze_plane().
...
Also make sure the AVFilterContext is only being used for logging by
changing the type to void*
2014-05-08 22:59:47 +02:00
Clément Bœsch
362ab940fc
avfilter/phase: add comment on the context cached frame.
2014-05-08 22:59:47 +02:00
Michael Niedermayer
996fffbbb3
Merge commit '0bacfa8d37710b904897e7cbeb8d6f96fbf75e2e'
...
* commit '0bacfa8d37710b904897e7cbeb8d6f96fbf75e2e':
rtmpproto: Check the buffer sizes when copying app/playpath strings
Conflicts:
libavformat/rtmpproto.c
See: 0c2a6dabce
See: 02ac3398eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-08 22:44:58 +02:00
Michael Niedermayer
126927c58e
avcodec/exr: mark gama option as experimental / unsupported
...
Suggested-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-08 21:10:53 +02:00
Gonzalo Garramuno
cd3daad77e
avcodec/exr: Add a gamma flag to exr loader to avoid banding
...
This is needed to avoid banding artifacts when gammaing the picture.
Currently, if done with a video filter, the process is done on uints
instead of full float.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-08 21:00:56 +02:00
Michael Niedermayer
0c2a6dabce
avformat/rtmpproto: add FFMIN() to av_strlcpy()
...
Suggested-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-08 18:19:38 +02:00