OSDN Git Service
Clément Bœsch [Wed, 29 Jun 2016 09:14:57 +0000 (11:14 +0200)]
Merge commit '
b7f98659f21dce438c33b512e25fd64b8d07c347'
* commit '
b7f98659f21dce438c33b512e25fd64b8d07c347':
Remove unnecessary get_bits.h #includes
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Wed, 29 Jun 2016 09:09:36 +0000 (11:09 +0200)]
Merge commit '
2a48a75a6f508121b96b0732a9fe03a46303f579'
* commit '
2a48a75a6f508121b96b0732a9fe03a46303f579':
sgirledec: simplify, no need to use reget buffer
This commit is a noop, see
ccc3f4e7104eda0f72436720ebcdc2e916217c7a
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Wed, 29 Jun 2016 09:07:41 +0000 (11:07 +0200)]
Merge commit '
6e2ad28cf76461b02d85ad178087ba0c628b8d9d'
* commit '
6e2ad28cf76461b02d85ad178087ba0c628b8d9d':
aic: add frame threading support
This commit is a noop, see
8e069eb525d46b8f89089e37fc7ac81b2d9b1092
Merged-by: Clément Bœsch <clement@stupeflix.com>
Clément Bœsch [Wed, 29 Jun 2016 09:03:55 +0000 (11:03 +0200)]
Merge commit '
c3ed259e4fef64a1af4f6537be545fba47491aa9'
* commit '
c3ed259e4fef64a1af4f6537be545fba47491aa9':
fate: Move Canopus decoder tests to a separate file
Merged-by: Clément Bœsch <clement@stupeflix.com>
Matthieu Bouron [Tue, 28 Jun 2016 10:25:27 +0000 (12:25 +0200)]
lavc/mediacodecdec_h264: add missing NAL headers to SPS/PPS buffers
Fixes a regression introduced by
0cd5e281df3f69c1ed8f2a72a5bcbf9691e1b5d5.
Michael Niedermayer [Tue, 28 Jun 2016 21:49:36 +0000 (23:49 +0200)]
avformat/mov: Check sample size
Fixes integer overflow
Fixes: poc.mp4
Found-by: ajax secure <ajax4sec@hotmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Martin Vignali [Sun, 26 Jun 2016 10:42:44 +0000 (12:42 +0200)]
fate/webp : add test for lossy compression.
the result of ffmpeg decoding is binary exact with the yuv output of
official decoder (dwebp)
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Tue, 28 Jun 2016 01:06:25 +0000 (03:06 +0200)]
avdevice/decklink_common: Replace rare spelling of Succesfully by 500 times more common one
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 28 Jun 2016 00:33:03 +0000 (02:33 +0200)]
avcodec/ccaption_dec: Fix mixed declaration and statement.
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Aman Gupta [Tue, 14 Jun 2016 18:57:42 +0000 (11:57 -0700)]
avcodec/ccaption_dec: implement tab offset commands
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 27 Jun 2016 13:16:54 +0000 (15:16 +0200)]
MAINTAINERS: remove 2.4 as 3.1 was released
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch [Mon, 27 Jun 2016 18:10:35 +0000 (20:10 +0200)]
Merge commit '
20a8c78ce0a5baf37f6a94e2d1e57e186b6f4b54'
* commit '
20a8c78ce0a5baf37f6a94e2d1e57e186b6f4b54':
avconv: Do not copy extradata if source buffer is empty
This commit is a noop, see
4d02dfbde475d249916eb19c360e890059aa6aa5
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 27 Jun 2016 17:54:37 +0000 (19:54 +0200)]
Merge commit '
38f99017e69bd25e88be87117237c29727c25635'
* commit '
38f99017e69bd25e88be87117237c29727c25635':
vp9: Return the correct size when decoding a superframe
This commit is a noop, see
c2f3715cb3fce093137591e3005de3e831b1f9fd
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 27 Jun 2016 17:48:21 +0000 (19:48 +0200)]
Merge commit '
b2d5d6a7f20a255a5f3c9bf539cc507afd909ce5'
* commit '
b2d5d6a7f20a255a5f3c9bf539cc507afd909ce5':
build: Only enable symbol reduction if the compiler does proper DCE
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 27 Jun 2016 17:39:46 +0000 (19:39 +0200)]
Merge commit '
c5fd4b50610f62cbb3baa4f4108139363128dea1'
* commit '
c5fd4b50610f62cbb3baa4f4108139363128dea1':
build: Simplify postprocessing of linker version script files
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Mon, 27 Jun 2016 15:54:22 +0000 (17:54 +0200)]
lavc/pnm_parser: disable parsing for text based PNMs
P1, P2, and P3 are respectively the text versions of PBM, PGM and PPM
files.
We can not obtain the buffer size using av_imgage_get_buffer_size() as
every pixel in the picture will occupy a random size between 16 and 32
bits ("4 " and "231 " are such example).
Ideally, we could look for the next header (or EOF) in the bytestream,
but this commit is meant to fix a decoding regression introduced by
48ac4532d437790e56b8ed5d0d467dc88685f035.
Fix Ticket #5670
Matthieu Bouron [Mon, 27 Jun 2016 15:51:57 +0000 (17:51 +0200)]
Merge commit '
535a742c2695a9e0c586b50d7fa76e318232ff24'
* commit '
535a742c2695a9e0c586b50d7fa76e318232ff24':
build: Change structure of the linker version script templates
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
Rick Kern [Mon, 27 Jun 2016 15:43:13 +0000 (11:43 -0400)]
Changelog: Add VideoToolbox encoder entry for 3.1
Signed-off-by: Rick Kern <kernrj@gmail.com>
Matthieu Bouron [Mon, 27 Jun 2016 15:34:10 +0000 (17:34 +0200)]
Merge commit '
5b1b495c8d21600eac694d50f428654a3125e217'
* commit '
5b1b495c8d21600eac694d50f428654a3125e217':
build: Print a message when generating version scripts
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
Matthieu Bouron [Mon, 27 Jun 2016 15:21:04 +0000 (17:21 +0200)]
asm: FF_-prefix internal macros used in inline assembly
See merge commit '
39d6d3618d48625decaff7d9bdbb45b44ef2a805'.
Matthieu Bouron [Mon, 27 Jun 2016 15:18:25 +0000 (17:18 +0200)]
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>
Paul B Mahol [Sat, 25 Jun 2016 09:33:46 +0000 (11:33 +0200)]
avformat/mov: parse rtmd track timecode
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Marton Balint [Sun, 26 Jun 2016 23:11:50 +0000 (01:11 +0200)]
avdevice/decklink: fix mingw portability
Fixes ticket #5669.
Signed-off-by: Marton Balint <cus@passwd.hu>
Rick Kern [Sun, 26 Jun 2016 20:44:40 +0000 (16:44 -0400)]
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>
Martin Vignali [Sat, 25 Jun 2016 19:53:23 +0000 (21:53 +0200)]
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>
Martin Vignali [Sat, 25 Jun 2016 18:16:01 +0000 (20:16 +0200)]
fate/exr : add tests for file with half and float channels
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Sun, 26 Jun 2016 18:27:47 +0000 (15:27 -0300)]
changelog: fix entry order
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sun, 26 Jun 2016 17:45:54 +0000 (14:45 -0300)]
Update FFmpeg 3.1 cut marker
Signed-off-by: James Almer <jamrial@gmail.com>
Marton Balint [Sat, 18 Jun 2016 22:35:44 +0000 (00:35 +0200)]
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>
Marton Balint [Sat, 18 Jun 2016 10:04:15 +0000 (12:04 +0200)]
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>
Marton Balint [Sat, 11 Jun 2016 11:41:29 +0000 (13:41 +0200)]
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>
Marton Balint [Sat, 18 Jun 2016 15:40:06 +0000 (17:40 +0200)]
avdevice/decklink: always free decklink resources on error
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 18 Jun 2016 14:55:47 +0000 (16:55 +0200)]
avdevice/decklink: factorize device finder function
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 18 Jun 2016 14:04:30 +0000 (16:04 +0200)]
avdevice/decklink: remove unused itermode iterators
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 18 Jun 2016 13:49:01 +0000 (15:49 +0200)]
avdevice/decklink: factorize cleanup function to common code
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sun, 19 Jun 2016 17:20:00 +0000 (19:20 +0200)]
avdevice/decklink_dec: fix bitrate calculations
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
Michael Niedermayer [Sun, 26 Jun 2016 15:34:37 +0000 (17:34 +0200)]
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>
Hendrik Leppkes [Sun, 26 Jun 2016 13:53:00 +0000 (15:53 +0200)]
Merge commit '
dc40a70c5755bccfb1a1349639943e1f408bea50'
* commit '
dc40a70c5755bccfb1a1349639943e1f408bea50':
Drop unnecessary libavutil/x86/asm.h #includes
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 13:45:21 +0000 (15:45 +0200)]
Merge commit '
5264e7ba217b3c0ceae813917134e1ab52573141'
* commit '
5264e7ba217b3c0ceae813917134e1ab52573141':
ac3: Check the array bound before dereferencing
See
d85ebea3f3b68ebccfe308fa839fc30fa634e4de
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 13:44:43 +0000 (15:44 +0200)]
Merge commit '
a86aa16088ad7f22a8918d71adb8c040d6033d84'
* commit '
a86aa16088ad7f22a8918d71adb8c040d6033d84':
vaapi_h264: Add trivial support for low-power encoding
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 13:44:35 +0000 (15:44 +0200)]
Merge commit '
b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b'
* commit '
b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b':
vaapi_h264: Fix frame_num after non-reference frames
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 13:44:25 +0000 (15:44 +0200)]
Merge commit '
2bfa067d0b636e7b2004fb0ad5a53d0d48c6de32'
* commit '
2bfa067d0b636e7b2004fb0ad5a53d0d48c6de32':
vaapi_encode: Check config attributes before creating config
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 13:43:05 +0000 (15:43 +0200)]
Merge commit '
6641819feedb086ebba3d2be89b8d33980f367e1'
* commit '
6641819feedb086ebba3d2be89b8d33980f367e1':
build: Ignore generated mapfile and remove it on distclean
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 13:41:49 +0000 (15:41 +0200)]
Merge commit '
f5c43884190be094749acfba104e3eab98d8ff1e'
* commit '
f5c43884190be094749acfba104e3eab98d8ff1e':
FATE: drop the audio stream from the dxtory test
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 13:39:06 +0000 (15:39 +0200)]
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>
Hendrik Leppkes [Sun, 26 Jun 2016 13:37:34 +0000 (15:37 +0200)]
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>
Hendrik Leppkes [Sun, 26 Jun 2016 13:36:27 +0000 (15:36 +0200)]
Merge commit '
9f7590f4e497c12693247d7f935a20d7773a64dd'
* commit '
9f7590f4e497c12693247d7f935a20d7773a64dd':
avconv_vaapi: use the hwcontext device creation API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 13:34:40 +0000 (15:34 +0200)]
hwcontext_dxva2: Use GetDesktopWindow instead of GetShellWindow
Improves compatibility with some MinGW variants,
see
771537edcf703434161c100e6898891546d1d4b3
Hendrik Leppkes [Sun, 26 Jun 2016 13:34:01 +0000 (15:34 +0200)]
Merge commit '
18c506e9e6e8df8b1d496d093077b8240ea68c28'
* commit '
18c506e9e6e8df8b1d496d093077b8240ea68c28':
avconv_dxva2: use the hwcontext device creation API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 13:29:39 +0000 (15:29 +0200)]
Merge commit '
f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6'
* commit '
f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6':
avconv_vdpau: use the hwcontext device creation API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 13:25:38 +0000 (15:25 +0200)]
Merge commit '
b8bf9194af602cf3a4bcd19a5e278e3d6d69f8fa'
* commit '
b8bf9194af602cf3a4bcd19a5e278e3d6d69f8fa':
hwcontext_vaapi: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 13:25:24 +0000 (15:25 +0200)]
Merge commit '
8e70385a8ed06f96f1e9e35cf7b6788a5c56eded'
* commit '
8e70385a8ed06f96f1e9e35cf7b6788a5c56eded':
hwcontext_dxva2: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 13:25:12 +0000 (15:25 +0200)]
Merge commit '
2e219b491bcc0845248345fdad31231b081e06d1'
* commit '
2e219b491bcc0845248345fdad31231b081e06d1':
hwcontext_cuda: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 13:24:53 +0000 (15:24 +0200)]
Merge commit '
38392b2af815898b8716826c4e29d95c04fb2647'
* commit '
38392b2af815898b8716826c4e29d95c04fb2647':
hwcontext_vdpau: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 13:23:24 +0000 (15:23 +0200)]
Merge commit '
1c9e8616c535ef496e7ee8a5cbc5e9e972a6977d'
* commit '
1c9e8616c535ef496e7ee8a5cbc5e9e972a6977d':
hwcontext: add a function for opening devices
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 13:18:56 +0000 (15:18 +0200)]
Merge commit '
24b5cff01bbac4e08acfd6d19c499e880988f520'
* commit '
24b5cff01bbac4e08acfd6d19c499e880988f520':
lavc: handle hw_frames_ctx where necessary
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 13:12:48 +0000 (15:12 +0200)]
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>
Hendrik Leppkes [Sun, 26 Jun 2016 13:06:47 +0000 (15:06 +0200)]
Merge commit '
7ca4fdc046a945949866bb6fc550e3cab1fc8c00'
* commit '
7ca4fdc046a945949866bb6fc550e3cab1fc8c00':
fate: More fine-grained dependencies for demuxer tests
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 12:58:58 +0000 (14:58 +0200)]
Merge commit '
07377fb557909015338b4c215b87b9c73ea577ad'
* commit '
07377fb557909015338b4c215b87b9c73ea577ad':
fate: More fine-grained dependencies for voice codec tests
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 12:51:33 +0000 (14:51 +0200)]
Merge commit '
3fdffc032e8ea5676bc0c2551b900c0dc887835b'
* commit '
3fdffc032e8ea5676bc0c2551b900c0dc887835b':
rtsp: Use avcodec_descriptor_get instead of avcodec_find_decoder
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 12:49:10 +0000 (14:49 +0200)]
Merge commit '
e47b8bbf0b54599d44b9330eb4d68cdde4f6d298'
* commit '
e47b8bbf0b54599d44b9330eb4d68cdde4f6d298':
avcodec: Bump micro version after changing public JPEG 2000 defines
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 12:41:05 +0000 (14:41 +0200)]
Merge commit '
ad61da054bd8c74a5d5b38d80846228fc6147108'
* commit '
ad61da054bd8c74a5d5b38d80846228fc6147108':
jpeg2000: Fix profile define values
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 12:40:19 +0000 (14:40 +0200)]
Merge commit '
ac84e618df4765ba751327497994066d0931e6a8'
* commit '
ac84e618df4765ba751327497994066d0931e6a8':
avfiltergraph: check the query_formats() return value
This commit is a noop, see
6a4c5c730ed67a7f472e43205fd96e91781796ce
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 12:35:10 +0000 (14:35 +0200)]
Merge commit '
2ef6dab0a79a9852a92ed80b07f9e32a37530d9e'
* commit '
2ef6dab0a79a9852a92ed80b07f9e32a37530d9e':
lavc: document that avcodec_close() should not be used
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 12:34:53 +0000 (14:34 +0200)]
Merge commit '
04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f'
* commit '
04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f':
lavc: deprecate avcodec_get_context_defaults3()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 12:34:02 +0000 (14:34 +0200)]
Merge commit '
5f30ac27795f9f98043e8582ccaad8813104adc4'
* commit '
5f30ac27795f9f98043e8582ccaad8813104adc4':
lavc: deprecate avcodec_copy_context()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 12:32:38 +0000 (14:32 +0200)]
Merge commit '
14634429b915333f3612eaf41db3954222dc4aaf'
* commit '
14634429b915333f3612eaf41db3954222dc4aaf':
lavf: update muxing doxy
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 12:31:53 +0000 (14:31 +0200)]
Merge commit '
74b1bf632f125a795e66e5fd0a060b9c7c55b7a3'
* commit '
74b1bf632f125a795e66e5fd0a060b9c7c55b7a3':
mp3: Make the extrasize explicit
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 12:19:48 +0000 (14:19 +0200)]
Merge commit '
52567e8198669a1e7493c75771613f87a90466c3'
* commit '
52567e8198669a1e7493c75771613f87a90466c3':
get_bits: Drop some TRACE-level debug code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 12:13:36 +0000 (14:13 +0200)]
Merge commit '
e45a638f50cc1dbeb87b9792e68f57e77fc0c3b5'
* commit '
e45a638f50cc1dbeb87b9792e68f57e77fc0c3b5':
dump: Drop unused variable
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 12:08:51 +0000 (14:08 +0200)]
Merge commit '
e2a3df1a464091075040a81ffc419fa21a8a5fd8'
* commit '
e2a3df1a464091075040a81ffc419fa21a8a5fd8':
avconv: Use more precise deprecation ifdefs
The PSNR functionality is not deprecated in ffmpeg.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 26 Jun 2016 12:05:57 +0000 (14:05 +0200)]
Merge commit '
35c858066840352d6d43385bbc728467c5150974'
* commit '
35c858066840352d6d43385bbc728467c5150974':
avconv: stop using AVStream.codec
Not merged, as ffmpeg.c is not migrated to codecpar yet, and this commit
only changes minor parts of AVStream.codec usage, which should get applied
after ffmpeg.c is using codecpar.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Paul B Mahol [Mon, 13 Jun 2016 10:17:44 +0000 (12:17 +0200)]
avcodec: add YUY2 Lossless Codec decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 26 Jun 2016 01:13:17 +0000 (03:13 +0200)]
doc/APIchanges: Add FFmpeg 3.1 cut marker
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 25 Jun 2016 23:38:18 +0000 (01:38 +0200)]
doc/APIchanges: Fill in and correct more stuff
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 24 Jun 2016 22:23:10 +0000 (00:23 +0200)]
avfilter/vf_paletteuse: enable skip_initial_unpaired
Fixes crash due to unprocessed input being passed through
This fixes the last segfault caused by mixing 3.0 and 3.1 libs and
applications
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 24 Jun 2016 22:22:47 +0000 (00:22 +0200)]
avfilter/dualinput: Add support to skip initial unpaired frames
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 21 Jun 2016 10:35:47 +0000 (12:35 +0200)]
avcodec/h264_sei: Do not skip subsequent SEIs on errors potentially caused by missing parameter sets.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 25 May 2016 15:55:29 +0000 (17:55 +0200)]
avfilter/src_movie: Add option to remove timestamp discontinuities
This can also be extended to remove discontiuities caused by seek commands
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Jan Sebechlebsky [Sat, 25 Jun 2016 15:14:24 +0000 (17:14 +0200)]
avformat/tee: Support arbitrary number of slaves
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Timo Rothenpieler [Sat, 25 Jun 2016 20:24:13 +0000 (22:24 +0200)]
avcodec/nvenc: Bring encoder names in line with other encoders
Rodger Combs [Sat, 25 Jun 2016 20:53:11 +0000 (15:53 -0500)]
lavf/srtdec: fix indent
Rodger Combs [Wed, 20 Apr 2016 06:15:35 +0000 (01:15 -0500)]
lavf: update auto-bsf to new BSF API
Rodger Combs [Wed, 20 Apr 2016 06:11:59 +0000 (01:11 -0500)]
lavf: deprecate av_apply_bitstream_filters
Rodger Combs [Mon, 6 Jun 2016 18:26:36 +0000 (13:26 -0500)]
lavf/srtdec: fix probing files with negative first timestamps
Martin Storsjö [Thu, 23 Jun 2016 22:13:16 +0000 (01:13 +0300)]
omx: Don't return > 0 from omx_encode_frame
The encode function is supposed to just return 0 on success.
This stems from a mixup with the return value of decode functions.
Reviewed-by: Jan Gerber <j@v2v.cc>
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 7 Apr 2016 15:26:56 +0000 (17:26 +0200)]
avformat/format: Fix registering a format more than once and related races
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch [Sat, 25 Jun 2016 17:14:21 +0000 (19:14 +0200)]
lavfi/subtitles: remove unecessary checks
Clément Bœsch [Sat, 25 Jun 2016 17:11:51 +0000 (19:11 +0200)]
lavfi/subtitles: fix memleak after
6bcb1e1a
Spotted-by: James Almer <jamrial@gmail.com>
Aman Gupta [Thu, 5 May 2016 18:54:50 +0000 (14:54 -0400)]
avcodec/omx: fix deprecation warning for ff_alloc_packet
Tested-by: Jan Gerber <j@v2v.cc>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Martin Vignali [Sat, 25 Jun 2016 16:24:12 +0000 (18:24 +0200)]
avcodec/exr: add missed hunks from previous exr commit
Martin Vignali [Sat, 25 Jun 2016 15:56:03 +0000 (17:56 +0200)]
avcodec/exr: fix reading float channel when there is half and float channels in a file
Clément Bœsch [Sat, 25 Jun 2016 14:41:38 +0000 (16:41 +0200)]
lavfi/subtitles: switch to codecpar
David Murmann [Wed, 22 Jun 2016 13:27:07 +0000 (15:27 +0200)]
avformat/movenc: add option to use keys/mdta atoms for metadata
Add -movflags use_metadata_tags to the mov muxer. This will cause
the muxer to write all metadata to the file in the keys and mtda
atoms.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch [Sat, 25 Jun 2016 11:41:13 +0000 (13:41 +0200)]
lavc/neontest: fix constness in arm/aarch64 avcodec_open2() wrappers
Clément Bœsch [Sat, 25 Jun 2016 11:38:53 +0000 (13:38 +0200)]
lavf/utils: fix const warning at a find_decoder() call
Clément Bœsch [Sat, 25 Jun 2016 11:35:46 +0000 (13:35 +0200)]
ffmpeg: do not use deprecated AVSubtitleRect.pict
Clément Bœsch [Sat, 25 Jun 2016 09:52:11 +0000 (11:52 +0200)]
Merge commit '
3399a26d3f57d462e839c0ee51223ae9aca20852'
* commit '
3399a26d3f57d462e839c0ee51223ae9aca20852':
nvenc: allow setting the number of slices
nvenc: De-compensate aspect ratio compensation of DVD-like content.
nvenc: list the major contributors in the copyright header
configure: Don't require nonfree for nvenc
nvenc: drop the hard dependency on CUDA
nvenc: only support HW frames when CUDA is enabled
nvenc: write the VUI signal properties for HEVC
nvenc: only write the VUI signal type fields if they are set
nvenc: Generate bufferingPeriod/pictureTiming SEI
nvenc: Delay frame output to increase encoding speed
nvenc: add support for lossless encoding
nvenc: Generate AUD NAL units for better compatiblity
nvenc: fix the rc option definitions
All these commits are noop as requested by Timo Rothenpieler.
<BtbN> andrey_turkin, ubitux, yeah, I like the current state of nvenc in
ffmpeg, I think most remaining differences should be merged on the libav
side of things. At least I'm not aware of anything that's missing in
ffmpeg.
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Sat, 25 Jun 2016 09:46:08 +0000 (11:46 +0200)]
Merge commit '
65dc7ca4c8e7e56362626a5d31e563e80108f104'
* commit '
65dc7ca4c8e7e56362626a5d31e563e80108f104':
Add release notes for 12.
This commit is a noop, but we absolutely need someone to write the
release notes.
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Sat, 25 Jun 2016 09:42:57 +0000 (11:42 +0200)]
Merge commit '
d68fb1475856cf93199e2bc4eee3063902c35df7'
* commit '
d68fb1475856cf93199e2bc4eee3063902c35df7':
mjpegdec: Properly fail on malloc failure
Merged-by: Clément Bœsch <u@pkh.me>