9eb3da2f99
asm: FF_-prefix internal macros used in inline assembly
...
See merge commit '39d6d3618d48625decaff7d9bdbb45b44ef2a805'.
9 years ago
39d6d3618d
Merge commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e'
...
* commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e':
asm: FF_-prefix internal macros used in inline assembly
This commit is a noop as the ASM codebase differs too much between libav
and ffmpeg. The corresponding chunks will be found in the next commit.
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
9 years ago
d693392886
avformat/mov: parse rtmd track timecode
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years ago
b18d6c5800
avdevice/decklink: fix mingw portability
...
Fixes ticket #5669 .
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
729d82abae
configure: use c++98 for c++ files
...
Use c++98 standard instead of c++11.
Signed-off-by: Rick Kern <kernrj@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
bd2cec7021
fate/webp : add test for webp lossless decoding (rgb and rgba)
...
output have been compared with official decoding tool output (dwebp)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
971ee09d32
fate/exr : add tests for file with half and float channels
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
c6f2d1a21f
changelog: fix entry order
...
Signed-off-by: James Almer <jamrial@gmail.com>
9 years ago
069fd69662
Update FFmpeg 3.1 cut marker
...
Signed-off-by: James Almer <jamrial@gmail.com>
9 years ago
cf0a05668b
avdevice/decklink: add support for setting input packet timestamp source
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
da89c6e37c
avdevice/decklink: add support for audio and video input selection
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
8f9fa49bd8
avdevice/decklink: add support for setting duplex mode
...
This patch also makes BlackMagic drivers v10.6.1 a hard requirement.
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
e22760aafd
avdevice/decklink: always free decklink resources on error
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
38d75fe906
avdevice/decklink: factorize device finder function
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
4ce0a77ec8
avdevice/decklink: remove unused itermode iterators
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
1fc85d8511
avdevice/decklink: factorize cleanup function to common code
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
340cea9f22
avdevice/decklink_dec: fix bitrate calculations
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years ago
e9394ca63d
avcodec/libopenjpegenc: Set numresolutions by default to a value that is not too large
...
Fixes issues with libopenjpeg 2.1
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9 years ago
c142dc203e
Merge commit 'dc40a70c5755bccfb1a1349639943e1f408bea50'
...
* commit 'dc40a70c5755bccfb1a1349639943e1f408bea50':
Drop unnecessary libavutil/x86/asm.h #includes
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
5e418fd63a
Merge commit '5264e7ba217b3c0ceae813917134e1ab52573141'
...
* commit '5264e7ba217b3c0ceae813917134e1ab52573141':
ac3: Check the array bound before dereferencing
See d85ebea3f3
9 years ago
f2a3798ea4
Merge commit 'a86aa16088ad7f22a8918d71adb8c040d6033d84'
...
* commit 'a86aa16088ad7f22a8918d71adb8c040d6033d84':
vaapi_h264: Add trivial support for low-power encoding
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
d3327b7eda
Merge commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b'
...
* commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b':
vaapi_h264: Fix frame_num after non-reference frames
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
18b1b8be6a
Merge commit '2bfa067d0b636e7b2004fb0ad5a53d0d48c6de32'
...
* commit '2bfa067d0b636e7b2004fb0ad5a53d0d48c6de32':
vaapi_encode: Check config attributes before creating config
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
5a9134f5f1
Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1'
...
* commit '6641819feedb086ebba3d2be89b8d33980f367e1':
build: Ignore generated mapfile and remove it on distclean
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
cd52ec2337
Merge commit 'f5c43884190be094749acfba104e3eab98d8ff1e'
...
* commit 'f5c43884190be094749acfba104e3eab98d8ff1e':
FATE: drop the audio stream from the dxtory test
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
7fe7cdca36
Merge commit 'fe7b21c8f148493c6fbceb7f887a77531dd1ae0e'
...
* commit 'fe7b21c8f148493c6fbceb7f887a77531dd1ae0e':
avconv: fix parsing bitstream filters
Not merged because ffmpeg_opt.c still uses the old BSF API.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
c9ee36e60f
Merge commit '80fb19bc234a3f2350d891adf39f3738a8e4849f'
...
* commit '80fb19bc234a3f2350d891adf39f3738a8e4849f':
avconv: fix a check for av_bsf_get_by_name() return value
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
4e6f2dbcd3
Merge commit '9f7590f4e497c12693247d7f935a20d7773a64dd'
...
* commit '9f7590f4e497c12693247d7f935a20d7773a64dd':
avconv_vaapi: use the hwcontext device creation API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
06a0e18435
hwcontext_dxva2: Use GetDesktopWindow instead of GetShellWindow
...
Improves compatibility with some MinGW variants,
see 771537edcf
9 years ago
85da4f9258
Merge commit '18c506e9e6e8df8b1d496d093077b8240ea68c28'
...
* commit '18c506e9e6e8df8b1d496d093077b8240ea68c28':
avconv_dxva2: use the hwcontext device creation API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
844256740d
Merge commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6'
...
* commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6':
avconv_vdpau: use the hwcontext device creation API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
ed5d03ff6f
Merge commit 'b8bf9194af602cf3a4bcd19a5e278e3d6d69f8fa'
...
* commit 'b8bf9194af602cf3a4bcd19a5e278e3d6d69f8fa':
hwcontext_vaapi: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
162370b473
Merge commit '8e70385a8ed06f96f1e9e35cf7b6788a5c56eded'
...
* commit '8e70385a8ed06f96f1e9e35cf7b6788a5c56eded':
hwcontext_dxva2: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
c5a0c16850
Merge commit '2e219b491bcc0845248345fdad31231b081e06d1'
...
* commit '2e219b491bcc0845248345fdad31231b081e06d1':
hwcontext_cuda: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
613ac3bf82
Merge commit '38392b2af815898b8716826c4e29d95c04fb2647'
...
* commit '38392b2af815898b8716826c4e29d95c04fb2647':
hwcontext_vdpau: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
481f320aa3
Merge commit '1c9e8616c535ef496e7ee8a5cbc5e9e972a6977d'
...
* commit '1c9e8616c535ef496e7ee8a5cbc5e9e972a6977d':
hwcontext: add a function for opening devices
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
2c1d0f871f
Merge commit '24b5cff01bbac4e08acfd6d19c499e880988f520'
...
* commit '24b5cff01bbac4e08acfd6d19c499e880988f520':
lavc: handle hw_frames_ctx where necessary
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
b20fe650ef
Merge commit '4024b566d664a4b161d677554be52f32e7ad4236'
...
* commit '4024b566d664a4b161d677554be52f32e7ad4236':
golomb: Give svq3_get_se_golomb()/svq3_get_ue_golomb() better names
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
324f0fbff1
Merge commit '7ca4fdc046a945949866bb6fc550e3cab1fc8c00'
...
* commit '7ca4fdc046a945949866bb6fc550e3cab1fc8c00':
fate: More fine-grained dependencies for demuxer tests
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
093e06f2d6
Merge commit '07377fb557909015338b4c215b87b9c73ea577ad'
...
* commit '07377fb557909015338b4c215b87b9c73ea577ad':
fate: More fine-grained dependencies for voice codec tests
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
f972653ec1
Merge commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b'
...
* commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b':
rtsp: Use avcodec_descriptor_get instead of avcodec_find_decoder
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
b95534bb67
Merge commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298'
...
* commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298':
avcodec: Bump micro version after changing public JPEG 2000 defines
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
46ff31d39c
Merge commit 'ad61da054bd8c74a5d5b38d80846228fc6147108'
...
* commit 'ad61da054bd8c74a5d5b38d80846228fc6147108':
jpeg2000: Fix profile define values
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
7c6ae9ca04
Merge commit 'ac84e618df4765ba751327497994066d0931e6a8'
...
* commit 'ac84e618df4765ba751327497994066d0931e6a8':
avfiltergraph: check the query_formats() return value
This commit is a noop, see 6a4c5c730e
9 years ago
f9a186c59b
Merge commit '2ef6dab0a79a9852a92ed80b07f9e32a37530d9e'
...
* commit '2ef6dab0a79a9852a92ed80b07f9e32a37530d9e':
lavc: document that avcodec_close() should not be used
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
69c38d64d7
Merge commit '04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f'
...
* commit '04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f':
lavc: deprecate avcodec_get_context_defaults3()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
6988cf2969
Merge commit '5f30ac27795f9f98043e8582ccaad8813104adc4'
...
* commit '5f30ac27795f9f98043e8582ccaad8813104adc4':
lavc: deprecate avcodec_copy_context()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
97bdb94341
Merge commit '14634429b915333f3612eaf41db3954222dc4aaf'
...
* commit '14634429b915333f3612eaf41db3954222dc4aaf':
lavf: update muxing doxy
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
314e608631
Merge commit '74b1bf632f125a795e66e5fd0a060b9c7c55b7a3'
...
* commit '74b1bf632f125a795e66e5fd0a060b9c7c55b7a3':
mp3: Make the extrasize explicit
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
e2836397f1
Merge commit '52567e8198669a1e7493c75771613f87a90466c3'
...
* commit '52567e8198669a1e7493c75771613f87a90466c3':
get_bits: Drop some TRACE-level debug code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago
Matthieu Bouron
Paul B Mahol
Marton Balint
Rick Kern
Martin Vignali
James Almer
Michael Niedermayer
Hendrik Leppkes