Matthieu Bouron
0fd76d77d6
Merge commit ' 5b1b495c8d'
...
* commit '5b1b495c8d ':
build: Print a message when generating version scripts
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
2016-06-27 17:35:04 +02:00
Matthieu Bouron
9eb3da2f99
asm: FF_-prefix internal macros used in inline assembly
...
See merge commit '39d6d3618d '.
2016-06-27 17:21:18 +02:00
Matthieu Bouron
39d6d3618d
Merge commit ' 1e9c5bf4c1'
...
* commit '1e9c5bf4c1 ':
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>
2016-06-27 17:18:25 +02:00
Paul B Mahol
d693392886
avformat/mov: parse rtmd track timecode
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-06-27 10:27:25 +02:00
Marton Balint
b18d6c5800
avdevice/decklink: fix mingw portability
...
Fixes ticket #5669 .
Signed-off-by: Marton Balint <cus@passwd.hu>
2016-06-27 02:12:07 +02:00
Rick Kern
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>
2016-06-26 23:25:23 +02:00
Martin Vignali
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>
2016-06-26 21:12:33 +02:00
Martin Vignali
971ee09d32
fate/exr : add tests for file with half and float channels
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-26 21:12:32 +02:00
James Almer
c6f2d1a21f
changelog: fix entry order
...
Signed-off-by: James Almer <jamrial@gmail.com>
2016-06-26 15:27:47 -03:00
James Almer
069fd69662
Update FFmpeg 3.1 cut marker
...
Signed-off-by: James Almer <jamrial@gmail.com>
2016-06-26 14:45:54 -03:00
Marton Balint
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>
2016-06-26 19:18:06 +02:00
Marton Balint
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>
2016-06-26 19:18:02 +02:00
Marton Balint
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>
2016-06-26 19:17:56 +02:00
Marton Balint
e22760aafd
avdevice/decklink: always free decklink resources on error
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
2016-06-26 19:17:52 +02:00
Marton Balint
38d75fe906
avdevice/decklink: factorize device finder function
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
2016-06-26 19:17:45 +02:00
Marton Balint
4ce0a77ec8
avdevice/decklink: remove unused itermode iterators
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
2016-06-26 19:17:40 +02:00
Marton Balint
1fc85d8511
avdevice/decklink: factorize cleanup function to common code
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
2016-06-26 19:17:37 +02:00
Marton Balint
340cea9f22
avdevice/decklink_dec: fix bitrate calculations
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
2016-06-26 19:17:29 +02:00
Michael Niedermayer
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>
2016-06-26 18:08:04 +02:00
Hendrik Leppkes
c142dc203e
Merge commit ' dc40a70c57'
...
* commit 'dc40a70c57 ':
Drop unnecessary libavutil/x86/asm.h #includes
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:53:00 +02:00
Hendrik Leppkes
5e418fd63a
Merge commit ' 5264e7ba21'
...
* commit '5264e7ba21 ':
ac3: Check the array bound before dereferencing
See d85ebea3f3
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:47:05 +02:00
Hendrik Leppkes
f2a3798ea4
Merge commit ' a86aa16088'
...
* commit 'a86aa16088 ':
vaapi_h264: Add trivial support for low-power encoding
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:44:43 +02:00
Hendrik Leppkes
d3327b7eda
Merge commit ' b51c7c6b8a'
...
* commit 'b51c7c6b8a ':
vaapi_h264: Fix frame_num after non-reference frames
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:44:35 +02:00
Hendrik Leppkes
18b1b8be6a
Merge commit ' 2bfa067d0b'
...
* commit '2bfa067d0b ':
vaapi_encode: Check config attributes before creating config
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:44:25 +02:00
Hendrik Leppkes
5a9134f5f1
Merge commit ' 6641819fee'
...
* commit '6641819fee ':
build: Ignore generated mapfile and remove it on distclean
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:43:05 +02:00
Hendrik Leppkes
cd52ec2337
Merge commit ' f5c4388419'
...
* commit 'f5c4388419 ':
FATE: drop the audio stream from the dxtory test
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:41:49 +02:00
Hendrik Leppkes
7fe7cdca36
Merge commit ' fe7b21c8f1'
...
* commit 'fe7b21c8f1 ':
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>
2016-06-26 15:39:06 +02:00
Hendrik Leppkes
c9ee36e60f
Merge commit ' 80fb19bc23'
...
* commit '80fb19bc23 ':
avconv: fix a check for av_bsf_get_by_name() return value
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:37:34 +02:00
Hendrik Leppkes
4e6f2dbcd3
Merge commit ' 9f7590f4e4'
...
* commit '9f7590f4e4 ':
avconv_vaapi: use the hwcontext device creation API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:36:27 +02:00
Hendrik Leppkes
06a0e18435
hwcontext_dxva2: Use GetDesktopWindow instead of GetShellWindow
...
Improves compatibility with some MinGW variants,
see 771537edcf
2016-06-26 15:34:40 +02:00
Hendrik Leppkes
85da4f9258
Merge commit ' 18c506e9e6'
...
* commit '18c506e9e6 ':
avconv_dxva2: use the hwcontext device creation API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:34:01 +02:00
Hendrik Leppkes
844256740d
Merge commit ' f72db3f2f3'
...
* commit 'f72db3f2f3 ':
avconv_vdpau: use the hwcontext device creation API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:29:39 +02:00
Hendrik Leppkes
ed5d03ff6f
Merge commit ' b8bf9194af'
...
* commit 'b8bf9194af ':
hwcontext_vaapi: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:25:38 +02:00
Hendrik Leppkes
162370b473
Merge commit ' 8e70385a8e'
...
* commit '8e70385a8e ':
hwcontext_dxva2: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:25:24 +02:00
Hendrik Leppkes
c5a0c16850
Merge commit ' 2e219b491b'
...
* commit '2e219b491b ':
hwcontext_cuda: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:25:12 +02:00
Hendrik Leppkes
613ac3bf82
Merge commit ' 38392b2af8'
...
* commit '38392b2af8 ':
hwcontext_vdpau: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:24:53 +02:00
Hendrik Leppkes
481f320aa3
Merge commit ' 1c9e8616c5'
...
* commit '1c9e8616c5 ':
hwcontext: add a function for opening devices
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:23:24 +02:00
Hendrik Leppkes
2c1d0f871f
Merge commit ' 24b5cff01b'
...
* commit '24b5cff01b ':
lavc: handle hw_frames_ctx where necessary
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:20:43 +02:00
Hendrik Leppkes
b20fe650ef
Merge commit ' 4024b566d6'
...
* commit '4024b566d6 ':
golomb: Give svq3_get_se_golomb()/svq3_get_ue_golomb() better names
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:12:48 +02:00
Hendrik Leppkes
324f0fbff1
Merge commit ' 7ca4fdc046'
...
* commit '7ca4fdc046 ':
fate: More fine-grained dependencies for demuxer tests
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 15:06:47 +02:00
Hendrik Leppkes
093e06f2d6
Merge commit ' 07377fb557'
...
* commit '07377fb557 ':
fate: More fine-grained dependencies for voice codec tests
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:58:58 +02:00
Hendrik Leppkes
f972653ec1
Merge commit ' 3fdffc032e'
...
* commit '3fdffc032e ':
rtsp: Use avcodec_descriptor_get instead of avcodec_find_decoder
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:51:33 +02:00
Hendrik Leppkes
b95534bb67
Merge commit ' e47b8bbf0b'
...
* commit 'e47b8bbf0b ':
avcodec: Bump micro version after changing public JPEG 2000 defines
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:49:10 +02:00
Hendrik Leppkes
46ff31d39c
Merge commit ' ad61da054b'
...
* commit 'ad61da054b ':
jpeg2000: Fix profile define values
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:41:05 +02:00
Hendrik Leppkes
7c6ae9ca04
Merge commit ' ac84e618df'
...
* commit 'ac84e618df ':
avfiltergraph: check the query_formats() return value
This commit is a noop, see 6a4c5c730e
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:40:19 +02:00
Hendrik Leppkes
f9a186c59b
Merge commit ' 2ef6dab0a7'
...
* commit '2ef6dab0a7 ':
lavc: document that avcodec_close() should not be used
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:35:10 +02:00
Hendrik Leppkes
69c38d64d7
Merge commit ' 04fc8e24a0'
...
* commit '04fc8e24a0 ':
lavc: deprecate avcodec_get_context_defaults3()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:34:53 +02:00
Hendrik Leppkes
6988cf2969
Merge commit ' 5f30ac2779'
...
* commit '5f30ac2779 ':
lavc: deprecate avcodec_copy_context()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:34:02 +02:00
Hendrik Leppkes
97bdb94341
Merge commit ' 14634429b9'
...
* commit '14634429b9 ':
lavf: update muxing doxy
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:32:38 +02:00
Hendrik Leppkes
314e608631
Merge commit ' 74b1bf632f'
...
* commit '74b1bf632f ':
mp3: Make the extrasize explicit
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-06-26 14:31:53 +02:00