]>
git.sesse.net Git - ffmpeg/log
Clément Bœsch [Fri, 31 Mar 2017 08:40:34 +0000 (10:40 +0200)]
Merge commit '
67deba8a416d818f3d95aef0aa916589090396e2 '
* commit '
67deba8a416d818f3d95aef0aa916589090396e2 ':
Use avpriv_report_missing_feature() where appropriate
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Fri, 31 Mar 2017 08:22:32 +0000 (10:22 +0200)]
Merge commit '
59d2b00d201935c16408a2917957d89a170fe58f '
* commit '
59d2b00d201935c16408a2917957d89a170fe58f ':
configure: Add --quiet command line parameter to suppress informative output
The license assignment is moved out of the quiet condition to make sure
it ends up in config.h
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Fri, 31 Mar 2017 08:13:25 +0000 (10:13 +0200)]
Merge commit '
4537647c0429fe7c8ee655ac3fda856ba67f58a0 '
* commit '
4537647c0429fe7c8ee655ac3fda856ba67f58a0 ':
fate: checkasm: Split monolithic test into individual components
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Fri, 31 Mar 2017 08:06:13 +0000 (10:06 +0200)]
Merge commit '
9498237049d15812cecb79df47b196c73013908b '
* commit '
9498237049d15812cecb79df47b196c73013908b ':
checkasm: Add --test parameter to check only specific components
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Fri, 31 Mar 2017 08:03:48 +0000 (10:03 +0200)]
Merge commit '
de6e2ff3ddf506d5b487c2f226cea73e095ad6d1 '
* commit '
de6e2ff3ddf506d5b487c2f226cea73e095ad6d1 ':
mov: Read multiple stsd from DV
This commit is a noop, see
a765ba647d3d5ecb7270011693cb5b171f9afd01
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Fri, 31 Mar 2017 08:02:39 +0000 (10:02 +0200)]
Merge commit '
47a795727f5433f5238a8a244cf181f61ea5af2c '
* commit '
47a795727f5433f5238a8a244cf181f61ea5af2c ':
hevc: Support extradata changes from multiple stsd
This commit is a noop, see
25fcbf7a84a485ae358f3fb3519ed4e8a98459cd
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Fri, 31 Mar 2017 07:57:33 +0000 (09:57 +0200)]
Merge commit '
2fe30b4743c0f4c3bdf37b91ae534cafa85e4036 '
* commit '
2fe30b4743c0f4c3bdf37b91ae534cafa85e4036 ':
hevc: Allow parsing external extradata buffers
This commit is a noop as it matches FFmpeg state.
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Fri, 31 Mar 2017 07:53:35 +0000 (09:53 +0200)]
Merge commit '
5be21531119d7a97ebc706800d1608272ee5a507 '
* commit '
5be21531119d7a97ebc706800d1608272ee5a507 ':
hevc: Move hevc_decode_extradata before frame decoding
This commit is a noop, hevc_decode_extradata() is already above
hevc_decode_frame().
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Fri, 31 Mar 2017 07:50:12 +0000 (09:50 +0200)]
Merge commit '
bed2c4b2652b1412b584e5545d6dd2ef8c613be0 '
* commit '
bed2c4b2652b1412b584e5545d6dd2ef8c613be0 ':
lavc: Add hevc main10 profile to avconv cli
This commit is a noop, see
271afd632f4de87db99ec085e75446b648dc6e60
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Fri, 31 Mar 2017 07:46:51 +0000 (09:46 +0200)]
Merge commit '
17dac56b8fdd80c594c39b76de3f27a7949afbde '
* commit '
17dac56b8fdd80c594c39b76de3f27a7949afbde ':
lavu: Rename ycgco color space appropriately
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Fri, 31 Mar 2017 07:44:04 +0000 (09:44 +0200)]
Merge commit '
0361e4dcb4d394c88c33364415a3b8fe315b67d1 '
* commit '
0361e4dcb4d394c88c33364415a3b8fe315b67d1 ':
h264_qpel: x86: Move function with only one instance out of template macro
Note: warning is present with clang.
Merged-by: Clément Bœsch <cboesch@gopro.com>
Mark Thompson [Thu, 30 Mar 2017 21:58:59 +0000 (22:58 +0100)]
pthread_frame: Propagate sw_pix_fmt across threads
This is required by the VP9 hwaccels (both DXVA2 and VAAPI) when
threads are enabled.
Tested-by: Hendrik Leppkes <h.leppkes@gmail.com>
Michael Niedermayer [Thu, 30 Mar 2017 21:07:52 +0000 (23:07 +0200)]
avutil/tests/dict: Check return of av_dict_parse_string()
Fixes: CID1396402
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 30 Mar 2017 21:03:24 +0000 (23:03 +0200)]
avformat/mov: Init ref_sc / ref_st to NULL
This is more robust in case some change or corner case causes them to be
dereferenced before being set
Fixes CID1396274, CID1396275
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 30 Mar 2017 20:55:28 +0000 (22:55 +0200)]
avformat/libopenmpt: Check for avio_size() failure
Fixes CID1396850
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 30 Mar 2017 20:12:13 +0000 (22:12 +0200)]
avfilter/af_chorus & aecho: Handle NULL return from av_strtok()
Fixes CID1396260
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 30 Mar 2017 20:12:12 +0000 (22:12 +0200)]
avcodec/clearvideo: Do not lose the return code of decode_mb()
Fixes CID1401671
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch [Thu, 30 Mar 2017 21:23:40 +0000 (23:23 +0200)]
Merge commit '
88f0cf8cd30c8ea283430e6710a7bd98bb9c0301 '
* commit '
88f0cf8cd30c8ea283430e6710a7bd98bb9c0301 ':
avplay: Correct function pointer assignments in options array
This commit is a noop, see
a9a1bc56abf1fa79104996bf7b98b12ca42cd32c
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Thu, 30 Mar 2017 21:22:52 +0000 (23:22 +0200)]
Merge commit '
943533d64c7fa7a1b2fc9559e67652c349d21d51 '
* commit '
943533d64c7fa7a1b2fc9559e67652c349d21d51 ':
avconv: Correct function pointer assignments in options array
This commit is a noop, see
4c96985af1b8870482b6b6ef9120960633f62cee
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Thu, 30 Mar 2017 21:22:07 +0000 (23:22 +0200)]
Merge commit '
43de8b328b62cf21ec176c3989065168da471a5f '
* commit '
43de8b328b62cf21ec176c3989065168da471a5f ':
lzf: update pointer p after realloc
This commit is a noop, see
bb6a7b6f75ac544c956e3eefee297700ef4d3468
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Thu, 30 Mar 2017 21:21:31 +0000 (23:21 +0200)]
Clément Bœsch [Thu, 30 Mar 2017 21:18:56 +0000 (23:18 +0200)]
Mark Thompson [Thu, 30 Mar 2017 21:07:57 +0000 (22:07 +0100)]
Merge commit '
4ab61cd983b539749bd621ea271624ddb5196a8e '
* commit '
4ab61cd983b539749bd621ea271624ddb5196a8e ':
qsv{enc,dec}: extend the internal frame allocator
Merged-by: Mark Thompson <sw@jkqxz.net>
Mark Thompson [Thu, 30 Mar 2017 21:06:03 +0000 (22:06 +0100)]
Merge commit '
00aeedd84105a17f414185bd33ecadebeddb3a27 '
* commit '
00aeedd84105a17f414185bd33ecadebeddb3a27 ':
qsv{dec,enc}: use a struct as a memory id with internal memory allocator
Merged-by: Mark Thompson <sw@jkqxz.net>
Mark Thompson [Thu, 30 Mar 2017 21:00:03 +0000 (22:00 +0100)]
Merge commit '
404e51478ecad060249d5b9bee6ab39a8a9d8c1c '
* commit '
404e51478ecad060249d5b9bee6ab39a8a9d8c1c ':
qsv{dec,enc}: always use an internal mfxFrameSurface1
Minor fixups for differences in the QSV encoder because of a53cc.
Merged-by: Mark Thompson <sw@jkqxz.net>
Mark Thompson [Thu, 30 Mar 2017 20:54:46 +0000 (21:54 +0100)]
Merge commit '
e8bbacbf529049c401bfeea70d5e0b5d2c8b6de6 '
* commit '
e8bbacbf529049c401bfeea70d5e0b5d2c8b6de6 ':
hwcontext_qsv: support frame mapping
Merged-by: Mark Thompson <sw@jkqxz.net>
Michael Niedermayer [Thu, 30 Mar 2017 20:24:47 +0000 (22:24 +0200)]
avfilter/vf_minterpolate: Use dx and dy
Fixes CID1396283 and CID1396284
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 30 Mar 2017 20:21:29 +0000 (22:21 +0200)]
avfilter/deshake_opencl: Remove redundant return
Fixes: CID1396846
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 30 Mar 2017 20:15:21 +0000 (22:15 +0200)]
avfilter/af_sofalizer: Fix bad shift
Fixes CID1396835
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Mark Thompson [Thu, 30 Mar 2017 20:18:23 +0000 (21:18 +0100)]
Merge commit '
8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d '
* commit '
8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d ':
hwcontext_qsv: transfer data through the child context when VPP fails
Merged-by: Mark Thompson <sw@jkqxz.net>
Mark Thompson [Thu, 30 Mar 2017 20:16:58 +0000 (21:16 +0100)]
Merge commit '
b91ce4860054430d3712deb0d9487cac2fcb7d68 '
* commit '
b91ce4860054430d3712deb0d9487cac2fcb7d68 ':
hwcontext_qsv: do not fail when download/upload VPP session creation fails
Merged-by: Mark Thompson <sw@jkqxz.net>
Mark Thompson [Thu, 30 Mar 2017 20:16:09 +0000 (21:16 +0100)]
Merge commit '
b115a35ea62b8f479b48d99a601f0e157517301e '
* commit '
b115a35ea62b8f479b48d99a601f0e157517301e ':
hwcontext_qsv: add support for the P8 format
Merged-by: Mark Thompson <sw@jkqxz.net>
Michael Niedermayer [Thu, 30 Mar 2017 17:00:00 +0000 (19:00 +0200)]
avcodec/atrac3: Check init_get_bits8() for failure
This is more for correctness than actually fixing a missing error path
Fixes CID1399967
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Gyan Doshi [Thu, 23 Mar 2017 13:34:30 +0000 (19:04 +0530)]
avfilter/avf_abitscope: Correct range for framerate
Signed-off-by: Gyan Doshi <gyandoshi@gmail.com>
Signed-off-by: Paul B Mahol <onemda@gmail.com> (via IRC)
Michael Niedermayer [Thu, 30 Mar 2017 13:12:19 +0000 (15:12 +0200)]
doc/examples/encode_audio: Favor a sample rate close to 44khz instead of the maximum sample rate
This is an example, people will copy and use this. The maximum supported is quite
unreasonable as a default choice
Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 30 Mar 2017 14:13:22 +0000 (16:13 +0200)]
ffmpeg: Fix avframe memleak
Fixes CID1401674
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 30 Mar 2017 13:58:32 +0000 (15:58 +0200)]
avformat/mux: Check return code of av_packet_split_side_data()
Fixes CID1403225
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Matthieu Bouron [Wed, 29 Mar 2017 14:25:24 +0000 (16:25 +0200)]
doc/examples/filtering_audio: switch to new decoding API
Matthieu Bouron [Wed, 29 Mar 2017 12:58:01 +0000 (14:58 +0200)]
doc/examples/filtering_video: switch to new decoding API
Clément Bœsch [Thu, 30 Mar 2017 11:59:15 +0000 (13:59 +0200)]
doc/codecs: add jedec-p22
Leo Izen [Tue, 28 Mar 2017 21:07:47 +0000 (17:07 -0400)]
avformat/nut: Add HEVC and Opus support
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Hendrik Leppkes [Thu, 30 Mar 2017 09:37:39 +0000 (11:37 +0200)]
Merge commit '
10065d9324c2e35ce7040b6a2b9ebf6079bcbf42 '
* commit '
10065d9324c2e35ce7040b6a2b9ebf6079bcbf42 ':
hwcontext_dxva2: add support for the P8 format
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Thu, 30 Mar 2017 09:33:51 +0000 (11:33 +0200)]
Merge commit '
910973765417f06a4a9ccbd006e4df74c32ecb01 '
* commit '
910973765417f06a4a9ccbd006e4df74c32ecb01 ':
hwcontext_dxva2: frame mapping support
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Clément Bœsch [Thu, 30 Mar 2017 09:13:08 +0000 (11:13 +0200)]
Merge commit '
fabfbfe5710050812147f93a351a53fdda56ff8c '
* commit '
fabfbfe5710050812147f93a351a53fdda56ff8c ':
dxva2: fix surface selection when compiled with both d3d11va and dxva2
This commit is a noop, see
153b36fc62849e0e1540a43829794e0503994ebb
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 30 Mar 2017 09:10:11 +0000 (11:10 +0200)]
Merge commit '
db0b3dccb3842de134721e8d5c275f56d384340d '
* commit '
db0b3dccb3842de134721e8d5c275f56d384340d ':
libx265: Add option to force IDR frames
This commit is a noop, see
8a8902f2213b28a8dab1520bd42e88e5073f1f59
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 30 Mar 2017 09:07:09 +0000 (11:07 +0200)]
Merge commit '
3cba09e5228c889d63814dc43bc68f15c9dbac77 '
* commit '
3cba09e5228c889d63814dc43bc68f15c9dbac77 ':
x86: Drop stray semicolons after function definitions
This commit is a noop, they are already fixed in FFmpeg.
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 30 Mar 2017 09:04:12 +0000 (11:04 +0200)]
Merge commit '
d1ef1b9eaa45043ea5df5a004fb37243e05da61d '
* commit '
d1ef1b9eaa45043ea5df5a004fb37243e05da61d ':
configure: Silence lld-link when getting the version number
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 30 Mar 2017 08:59:10 +0000 (10:59 +0200)]
Merge commit '
392caa65df3efa8b2d48a80f08a6af4892c61c08 '
* commit '
392caa65df3efa8b2d48a80f08a6af4892c61c08 ':
arm: vp9mc: Insert a literal pool at the middle of the file
This commit is a noop, see
68caef9d48c4f1540b1b3181ebe7062a3417c62a
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 30 Mar 2017 08:55:32 +0000 (10:55 +0200)]
Merge commit '
8ad9f9d675eab139aa2208722009eeed981460dd '
* commit '
8ad9f9d675eab139aa2208722009eeed981460dd ':
hwcontext_vaapi: Frame mapping support
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 30 Mar 2017 08:41:24 +0000 (10:41 +0200)]
Merge commit '
124e26971e69bb25f38c6c7cb3fa20c77cf10966 '
* commit '
124e26971e69bb25f38c6c7cb3fa20c77cf10966 ':
lavfi: Hardware map filter
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 30 Mar 2017 08:36:37 +0000 (10:36 +0200)]
Merge commit '
d06aa24ba583ad08025da9e1b29afcd8218ff9b0 '
* commit '
d06aa24ba583ad08025da9e1b29afcd8218ff9b0 ':
hwcontext: Hardware frame mapping
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 30 Mar 2017 08:26:29 +0000 (10:26 +0200)]
Merge commit '
67351924fa91dea4339109100a4c0689f006581f '
* commit '
67351924fa91dea4339109100a4c0689f006581f ':
Drop unreachable break and return statements
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 30 Mar 2017 08:23:25 +0000 (10:23 +0200)]
Merge commit '
99434f4df81b6801b2b535d5b9143305595784f6 '
* commit '
99434f4df81b6801b2b535d5b9143305595784f6 ':
float_dsp: Have implementation match function pointer prototype
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 30 Mar 2017 08:21:37 +0000 (10:21 +0200)]
Merge commit '
6354957a95022864746180525680cca872ab0e0a '
* commit '
6354957a95022864746180525680cca872ab0e0a ':
dnxhdenc: Have function pointer prototype match implementation
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 30 Mar 2017 08:14:21 +0000 (10:14 +0200)]
Merge commit '
c778eb15b89d875cb246b18f65b3b4321cb1e7d6 '
* commit '
c778eb15b89d875cb246b18f65b3b4321cb1e7d6 ':
pixblockdsp: Have function pointer prototype match implementation
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 30 Mar 2017 08:12:43 +0000 (10:12 +0200)]
Merge commit '
99ddeddc7fc996c0c1e842112928490e78542bd5 '
* commit '
99ddeddc7fc996c0c1e842112928490e78542bd5 ':
ituh263dec: Have function signature match across declaration and definition
This commit is a noop, see
2d2b363c652403ac0bda129912e1910aacdaa3fc
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 30 Mar 2017 08:07:00 +0000 (10:07 +0200)]
Merge commit '
67c65e461cb073d61ffbc78845d4a3d8f14bf481 '
* commit '
67c65e461cb073d61ffbc78845d4a3d8f14bf481 ':
vf_hwupload_cuda: Fix build error
This commit is a noop, see
78e871ebbcc6f3c877e7292c4dda0c9979f8ede4
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 30 Mar 2017 08:06:01 +0000 (10:06 +0200)]
Merge commit '
13fcdfb976038f63b9f753e2ebcc8e04d7c7abc2 '
* commit '
13fcdfb976038f63b9f753e2ebcc8e04d7c7abc2 ':
svq3: Drop unused function dctcoef_get()
This commit is a noop, see
1e298e77240099aa45bb8c955ee0313392227f42
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 30 Mar 2017 08:03:59 +0000 (10:03 +0200)]
Merge commit '
ee59f0540875ab42496af2aacddd942757707683 '
* commit '
ee59f0540875ab42496af2aacddd942757707683 ':
intrax8: Have function signature match across declaration and definition
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 30 Mar 2017 07:58:09 +0000 (09:58 +0200)]
Merge commit '
1a469a5e423bdad779b8534247dea8cc86169b88 '
* commit '
1a469a5e423bdad779b8534247dea8cc86169b88 ':
options_table: Remove a now unnecessary include of config.h
This commit is a noop, see
76f43cbe2648ac5cb0e5a146f7e843310002199a
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 30 Mar 2017 07:47:50 +0000 (09:47 +0200)]
Merge commit '
ffbd1d2b0002576ef0d976a41ff959c635373fdc '
* commit '
ffbd1d2b0002576ef0d976a41ff959c635373fdc ':
arm: vp9: Add NEON optimizations of VP9 MC functions
This commit is a noop, see
68caef9d48c4f1540b1b3181ebe7062a3417c62a
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Thu, 30 Mar 2017 07:35:37 +0000 (09:35 +0200)]
Merge commit '
2e55e26b40e269816bba54da7d0e03955731b8fe '
* commit '
2e55e26b40e269816bba54da7d0e03955731b8fe ':
vp9: Flip the order of arguments in MC functions
This commit is a noop, it was made to match our prototypes.
Merged-by: Clément Bœsch <cboesch@gopro.com>
Michael Niedermayer [Thu, 30 Mar 2017 00:41:10 +0000 (02:41 +0200)]
tests/fate/source-check: Use git grep in place of grep
grep -L is not posix, solaris default grep does not support it
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 28 Mar 2017 21:50:03 +0000 (23:50 +0200)]
avfilter: Add AV_OPT_FLAG_FILTERING_PARAM where it is missing
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Sat, 25 Mar 2017 16:47:15 +0000 (13:47 -0300)]
ffprobe: fix printing packet side data information
Signed-off-by: James Almer <jamrial@gmail.com>
Matthieu Bouron [Wed, 29 Mar 2017 21:39:40 +0000 (23:39 +0200)]
Merge commit '
e3fb74f7f9a8f1895381355f40c92cac3c1023d9 '
* commit '
e3fb74f7f9a8f1895381355f40c92cac3c1023d9 ':
lavfi: Always propagate hw_frames_ctx through links
Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Matthieu Bouron [Wed, 29 Mar 2017 21:31:20 +0000 (23:31 +0200)]
Merge commit '
7e2561fa8313982aa21f7657953eedeeb33b210d '
* commit '
7e2561fa8313982aa21f7657953eedeeb33b210d ':
lavfi: Use ff_get_video_buffer in all filters using hwframes
vf_hwupload_cuda: Fix build error
Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Martin Vignali [Sat, 18 Mar 2017 17:24:55 +0000 (18:24 +0100)]
avcodec/exr: add support for uint32
Matthieu Bouron [Wed, 29 Mar 2017 21:11:10 +0000 (23:11 +0200)]
Merge commit '
7433feb82f75827884d909de34d341a1c4401d4a '
* commit '
7433feb82f75827884d909de34d341a1c4401d4a ':
lavfi: Make default get_video_buffer work with hardware frames
Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Clément Bœsch [Wed, 29 Mar 2017 14:09:28 +0000 (16:09 +0200)]
lavfi/signature: fix -Wformat warnings raised by DJGPP
This was forgotten due to the non-gpl build used in
549045254 .
Clément Bœsch [Wed, 29 Mar 2017 13:20:10 +0000 (15:20 +0200)]
Merge commit '
2025d3787158ba272a1b8fbc0493fa20dd7a8484 '
* commit '
2025d3787158ba272a1b8fbc0493fa20dd7a8484 ':
doc: Turn off noisy deprecation warnings in the option printer
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 29 Mar 2017 13:17:59 +0000 (15:17 +0200)]
Merge commit '
f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6 '
* commit '
f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6 ':
rtmpproto: Restructure zlib code to avoid unreachable code warning
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 29 Mar 2017 13:09:19 +0000 (15:09 +0200)]
Merge commit '
baab87c4f30e75ea309294b06adcd01ce678bdc5 '
* commit '
baab87c4f30e75ea309294b06adcd01ce678bdc5 ':
bink: Have function pointer prototype match implementation
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 29 Mar 2017 13:07:29 +0000 (15:07 +0200)]
lavc/idctdsp: use prefix restrict with av_
Clément Bœsch [Wed, 29 Mar 2017 10:20:32 +0000 (12:20 +0200)]
lavc/pthread_slice: remove pointless condition
Clément Bœsch [Mon, 27 Mar 2017 19:31:46 +0000 (21:31 +0200)]
Fix all -Wformat warnings raised by DJGPP
Clément Bœsch [Mon, 27 Mar 2017 18:30:24 +0000 (20:30 +0200)]
lavu/mem: clamp alignment to 16 for DJGPP
See also https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80208
Clément Bœsch [Sun, 26 Mar 2017 18:51:14 +0000 (20:51 +0200)]
lavfi/xbr: undef PI if defined
This conflict with the DJGPP libc math.h which includes a PI macro (to
M_PI).
We cannot make DJGPP POSIX only (using -D_POSIX_SOURCE) to avoid this
kind of symbols conflicts due to the lack of both posix_memalign and
memalign (DJGPP non standard function) in that POSIX mode. We currently
rely on memalign for aligned heap allocation.
Clément Bœsch [Sun, 26 Mar 2017 18:43:11 +0000 (20:43 +0200)]
lavfi/psnr: rename pow2 to pow_2
This conflict with the DJGPP libc which includes a pow2 function¹
We cannot make DJGPP POSIX only (using -D_POSIX_SOURCE) to avoid this
kind of symbols conflicts due to the lack of both posix_memalign and
memalign (DJGPP non standard function) in that POSIX mode. We currently
rely on memalign for aligned heap allocation.
[1]: http://www.delorie.com/djgpp/doc/libc-2.02/libc_536.html
Clément Bœsch [Sun, 26 Mar 2017 18:41:41 +0000 (20:41 +0200)]
lavfi/dynaudnorm: rename pow2 to pow_2
This conflict with the DJGPP libc which includes a pow2 function¹
We cannot make DJGPP POSIX only (using -D_POSIX_SOURCE) to avoid this
kind of symbols conflicts due to the lack of both posix_memalign and
memalign (DJGPP non standard function) in that POSIX mode. We currently
rely on memalign for aligned heap allocation.
[1]: http://www.delorie.com/djgpp/doc/libc-2.02/libc_536.html
Clément Bœsch [Mon, 27 Mar 2017 07:45:11 +0000 (09:45 +0200)]
lavc: use av_fourcc2str() where appropriate
Clément Bœsch [Mon, 27 Mar 2017 07:45:35 +0000 (09:45 +0200)]
lavf: use av_fourcc2str() where appropriate
Clément Bœsch [Mon, 27 Mar 2017 07:41:34 +0000 (09:41 +0200)]
lavf/ape: remove unused magic field
Clément Bœsch [Sun, 26 Mar 2017 23:37:09 +0000 (01:37 +0200)]
ffmpeg_videotoolbox: fix usage of av_get_codec_tag_string()
Clément Bœsch [Sun, 26 Mar 2017 23:36:53 +0000 (01:36 +0200)]
ffprobe: fix usage of av_get_codec_tag_string()
Clément Bœsch [Sun, 26 Mar 2017 23:32:13 +0000 (01:32 +0200)]
tools/fourcc2pixfmt: fix usages of av_get_codec_tag_string()
Clément Bœsch [Sun, 26 Mar 2017 23:31:52 +0000 (01:31 +0200)]
lavf: fix usages of av_get_codec_tag_string()
Clément Bœsch [Sun, 26 Mar 2017 23:31:37 +0000 (01:31 +0200)]
lavc: fix usages of av_get_codec_tag_string()
Clément Bœsch [Sun, 26 Mar 2017 23:11:41 +0000 (01:11 +0200)]
lavc: deprecate av_get_codec_tag_string()
Clément Bœsch [Sun, 26 Mar 2017 23:05:18 +0000 (01:05 +0200)]
lavu: add av_fourcc_make_string() and av_fourcc2str()
Clément Bœsch [Wed, 29 Mar 2017 12:37:35 +0000 (14:37 +0200)]
Merge commit '
4cf2ffb7c45840b09bc49e34da88d4053dd442cb '
* commit '
4cf2ffb7c45840b09bc49e34da88d4053dd442cb ':
idct: Have function pointer prototype match implementation
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 29 Mar 2017 12:34:58 +0000 (14:34 +0200)]
Merge commit '
39cea6570c11a49b64b2ec8d71e218db03b4c742 '
* commit '
39cea6570c11a49b64b2ec8d71e218db03b4c742 ':
aactab: Move extern keyword to the front of array declarations
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 29 Mar 2017 12:26:21 +0000 (14:26 +0200)]
Merge commit '
85baef4ff1512bcc2544928bfa5f42072903a691 '
* commit '
85baef4ff1512bcc2544928bfa5f42072903a691 ':
vf_drawtext: Move static keyword to beginning of variable declaration
This commit is mostly a noop, see:
d9e2aceb7f1c712a52672129ca7971872b030e1e
6d7aa437e1108dd8142ae5b850a00c109f95f07f
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 29 Mar 2017 12:24:20 +0000 (14:24 +0200)]
Merge commit '
636515c324facaa14ccd8ab0732740a240a31ba9 '
* commit '
636515c324facaa14ccd8ab0732740a240a31ba9 ':
examples/decode_video: remove a stray unrelated comment
This commit is a noop, see
8c4753f7f5f1f65532e841cffa3b4fdb368c2fdf
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 29 Mar 2017 12:22:32 +0000 (14:22 +0200)]
Merge commit '
8191f960a669819db4de33a2439ded1630b8a73e '
* commit '
8191f960a669819db4de33a2439ded1630b8a73e ':
examples/decode_video: constify the AVCodec instance
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 29 Mar 2017 12:20:25 +0000 (14:20 +0200)]
Merge commit '
5b4d7ac7ae5d821cfa6ab89f8eab4d31851ef32c '
* commit '
5b4d7ac7ae5d821cfa6ab89f8eab4d31851ef32c ':
examples/encode_video: use the AVFrame API for allocating the frame
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 29 Mar 2017 12:18:10 +0000 (14:18 +0200)]
doc/examples/{de,en}code_audio: fix includes
Consistent with other examples.
Clément Bœsch [Wed, 29 Mar 2017 12:16:33 +0000 (14:16 +0200)]
Merge commit '
d0a603a534a0ee4b255e5e72742428a7f7f42b83 '
* commit '
d0a603a534a0ee4b255e5e72742428a7f7f42b83 ':
examples/encode_video: set the framerate
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 29 Mar 2017 12:15:01 +0000 (14:15 +0200)]
Merge commit '
e02524025bce2c8bf8b5bffd96479785c75a70d4 '
* commit '
e02524025bce2c8bf8b5bffd96479785c75a70d4 ':
examples/encode_video: constify the AVCodec instance
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 29 Mar 2017 12:07:39 +0000 (14:07 +0200)]
Merge commit '
7b1f03477f1a43d2261fbd83e50a4ad90c7f806d '
* commit '
7b1f03477f1a43d2261fbd83e50a4ad90c7f806d ':
examples/avcodec: split the remaining two examples into separate files
Merged-by: Clément Bœsch <u@pkh.me>