]>
git.sesse.net Git - ffmpeg/log
James Almer [Thu, 28 Sep 2017 02:35:59 +0000 (23:35 -0300)]
Merge commit '
04f3bd349651694f30feeb8c4ed9bc58106fca54 '
* commit '
04f3bd349651694f30feeb8c4ed9bc58106fca54 ':
AVFrame: add an opaque_ref field
This commit is a noop, see
e3af49b14bf371e18fab1c12cba0239e6658672c
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 02:29:20 +0000 (23:29 -0300)]
Merge commit '
4de220d2e3751c459f8739a08ac6ca52e63eba30 '
* commit '
4de220d2e3751c459f8739a08ac6ca52e63eba30 ':
frame: allow align=0 (meaning automatic) for av_frame_get_buffer()
See https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/215834.html
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 02:16:43 +0000 (23:16 -0300)]
Merge commit '
f44ec22e095c5ba00ffeadd891655c456e3dd014 '
* commit '
f44ec22e095c5ba00ffeadd891655c456e3dd014 ':
lavc: use av_cpu_max_align() instead of hardcoding alignment requirements
This commit is a noop, see
https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/215834.html
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 02:10:09 +0000 (23:10 -0300)]
avutil/cpu: split flag checks per arch in av_cpu_max_align()
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 28 Sep 2017 01:56:53 +0000 (22:56 -0300)]
Merge commit '
e6bff23f1e11aefb16a2b5d6ee72bf7469c5a66e '
* commit '
e6bff23f1e11aefb16a2b5d6ee72bf7469c5a66e ':
cpu: add a function for querying maximum required data alignment
Adapted to work with the arbitrary runtime cpuflag changes av_force_cpu_flags()
can generate.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 27 Sep 2017 23:59:14 +0000 (20:59 -0300)]
Merge commit '
5c8a5765dc5f4e29afb85b95be393c30f45412a8 '
* commit '
5c8a5765dc5f4e29afb85b95be393c30f45412a8 ':
scale_npp: explicitly set the output frames context for passthrough mode
See
62b75537db15816fde8b8a33976ffc4a8277f1fc
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 27 Sep 2017 23:55:46 +0000 (20:55 -0300)]
Merge commit '
6f554521afdf7ab4edbfaa9536660a1dca946b19 '
* commit '
6f554521afdf7ab4edbfaa9536660a1dca946b19 ':
Use the new AVIOContext destructor.
avio: add a destructor for AVIOContext
This commit is a noop, see
b12e4d3bb8df994f042ff1216fb8de2b967aab9e
78a7af823b7c2a1e3184e6680f2b49bf67101e5c
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 27 Sep 2017 23:51:29 +0000 (20:51 -0300)]
Merge commit '
435cd7bc99671bf561193421a50ac6e9d63c4266 '
* commit '
435cd7bc99671bf561193421a50ac6e9d63c4266 ':
arm: vp9lpf: Use orrs instead of orr+cmp
arm/aarch64: vp9lpf: Calculate !hev directly
aarch64: vp9itxfm: Optimize 16x16 and 32x32 idct dc by unrolling
arm: vp9itxfm: Optimize 16x16 and 32x32 idct dc by unrolling
aarch64: vp9mc: Calculate less unused data in the 4 pixel wide horizontal filter
arm: vp9mc: Calculate less unused data in the 4 pixel wide horizontal filter
aarch64: vp9mc: Simplify the extmla macro parameters
This commit is a noop, see
ac6cb8ae5b1c56c4a3fceb635c60d05e447c4365
bff07715904cc02f04eb5c5e171b431eb00f0c3b
045e33ae3fee74e39b1321dddf727eacb1ecf541
758302e4bc14e93989e7feb1135ec3f807c3310d
148cc0bb890839bc2a9cda514c5e71acc39eb374
f0ecbb13cf1cf706a1350dad657219dc7b3c131e
92ab8374b1051dd632c3ccc326b6cb1d564f293f
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 27 Sep 2017 23:42:39 +0000 (20:42 -0300)]
James Almer [Wed, 27 Sep 2017 23:35:04 +0000 (20:35 -0300)]
Merge commit '
ce6d72d10776b03c6780d4aa676414ce002285d4 '
* commit '
ce6d72d10776b03c6780d4aa676414ce002285d4 ':
imgutils: Document av_image_get_buffer_size()
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 27 Sep 2017 23:33:41 +0000 (20:33 -0300)]
Merge commit '
b6093e8c72a80710f086c678ab0730cf30953b5c '
* commit '
b6093e8c72a80710f086c678ab0730cf30953b5c ':
hlsenc: Correctly write down all 16 bytes in hex
This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 27 Sep 2017 23:31:12 +0000 (20:31 -0300)]
Merge commit '
bc2589763042dc2384b724b203ec778f35bcebad '
* commit '
bc2589763042dc2384b724b203ec778f35bcebad ':
utvideodec: Add a missing include
This commit is a noop, see
91ed4e71967f19824237de4c374f038b543c7555
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 27 Sep 2017 23:29:20 +0000 (20:29 -0300)]
Merge commit '
a52976c0feab6e86138983c248bd01fa45cdda69 '
* commit '
a52976c0feab6e86138983c248bd01fa45cdda69 ':
nvenc: make gpu indices independent of supported capabilities
This commit is a noop, see
5403d90f32656719a766254d77bbe4411e473eed
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 27 Sep 2017 23:26:57 +0000 (20:26 -0300)]
Merge commit '
77c23704c769168e4210956314775a1931f6aa0b '
* commit '
77c23704c769168e4210956314775a1931f6aa0b ':
avcodec: Mark some codecs with threadsafe init as such
This commit is a noop, see
91ed4e71967f19824237de4c374f038b543c7555
Merged-by: James Almer <jamrial@gmail.com>
Mark Thompson [Wed, 27 Sep 2017 22:34:06 +0000 (23:34 +0100)]
lavc: Move V4L2 encoders lower in the list
Their previous positioning would cause them to chosen before software
encoders like libx264 or libvpx.
James Almer [Wed, 27 Sep 2017 22:37:15 +0000 (19:37 -0300)]
Merge commit '
0c0b87f12d48d4e7f0d3d13f9345e828a3a5ea32 '
* commit '
0c0b87f12d48d4e7f0d3d13f9345e828a3a5ea32 ':
aarch64: vp9itxfm: Fix incorrect vertical alignment
aarch64: vp9itxfm: Update a comment to refer to a register with a different name
aarch64: vp9itxfm: Use the right lane sizes in 8x8 for improved readability
aarch64: vp9itxfm: Use a single lane ld1 instead of ld1r where possible
aarch64: vp9itxfm: Share instructions for loading idct coeffs in the 8x8 function
arm: vp9itxfm: Share instructions for loading idct coeffs in the 8x8 function
aarch64: vp9itxfm: Do separate functions for half/quarter idct16 and idct32
arm: vp9itxfm: Do a simpler half/quarter idct16/idct32 when possible
aarch64: vp9itxfm: Move the load_add_store macro out from the itxfm16 pass2 function
arm: vp9itxfm: Move the load_add_store macro out from the itxfm16 pass2 function
aarch64: vp9itxfm: Make the larger core transforms standalone functions
arm: vp9itxfm: Make the larger core transforms standalone functions
This commit is a noop, see
f8fcee0daf42d16581ec581bd5ff6373c3a76103
dc47bf3872fde18f6aea33f015a95b70e24dff19
3bd9b39108076e1fca8cd26970cb946fce66523a
a681c793a30386d01d273ce86b3368311cffb511
824589556cb7c4bfafb8a0190e71a10c628f5339
9532a7d4d060f2a2741225a76945daed52dbc478
1d8ab576a7e40ea6209dd753929f26dcb37e1444
3006e5253afc6a0ee001916806aae80f157d7043
19a0f9529ccdb48696f0caa251fe36b1d30df739
6752318c737663f0ac019de3acd63e3cea706864
d0fbf7f34e7243f6a4cbde9925f34d924e6d93f7
16ef000799b227d0226b7a678d28c34ff1d09410
Merged-by: James Almer <jamrial@gmail.com>
Mark Thompson [Wed, 27 Sep 2017 22:06:49 +0000 (23:06 +0100)]
lavc/v4l2: Add missing header include
Fixes checkheaders.
James Almer [Wed, 27 Sep 2017 22:08:19 +0000 (19:08 -0300)]
Merge commit '
c546147db07d16a76c2fb698d2e8a3057f393475 '
* commit '
c546147db07d16a76c2fb698d2e8a3057f393475 ':
configure: Correctly recurse in do_check_deps()
See
7659f35638e2ca7a8b202cb3007ca5473b108fa4 .
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 27 Sep 2017 22:06:12 +0000 (19:06 -0300)]
Merge commit '
57ec83e4246b21c2f0c068b9151d806737d4497f '
* commit '
57ec83e4246b21c2f0c068b9151d806737d4497f ':
omx: Use the EOS flag to handle flushing at the end
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 27 Sep 2017 21:56:08 +0000 (18:56 -0300)]
Merge commit '
dad7a9c7c0ae8ebc56f2e3a24e6fa4da5c2cd491 '
* commit '
dad7a9c7c0ae8ebc56f2e3a24e6fa4da5c2cd491 ':
configure: Rework dependency handling for conflicting components
Includes an important fix made by
c546147db07d16a76c2fb698d2e8a3057f393475
as well.
Merged-by: James Almer <jamrial@gmail.com>
Lionel CHAZALLON [Sun, 24 Sep 2017 05:39:45 +0000 (05:39 +0000)]
lavc: Add support for RockChip Media Process Platform
This adds hardware decoding for H.264 / HEVC / VP8 / VP9 using the MPP
Rockchip API. It returns frames holding an AVDRMFrameDescriptor struct
in buf[0] that allows drm / dmabuf usage. Tested on RK3288 (TinkerBoard)
and RK3328.
Signed-off-by: Mark Thompson <sw@jkqxz.net>
James Almer [Wed, 27 Sep 2017 19:45:32 +0000 (16:45 -0300)]
Merge commit '
9127ac5ebc941d5e54828a91e5072c876be8ec42 '
* commit '
9127ac5ebc941d5e54828a91e5072c876be8ec42 ':
configure: Add name parameter to require_pkg_config() helper function
Merged-by: James Almer <jamrial@gmail.com>
Kaustubh Raste [Tue, 26 Sep 2017 07:50:23 +0000 (13:20 +0530)]
avcodec/mips: Improve avc put mc 20, 01 and 03 msa functions
Remove loops and unroll as block sizes are known.
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kaustubh Raste [Tue, 26 Sep 2017 05:26:27 +0000 (10:56 +0530)]
avcodec/mips: Improve avc chroma vert mc msa functions
Replace generic with block size specific function.
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kaustubh Raste [Tue, 26 Sep 2017 05:21:12 +0000 (10:51 +0530)]
avcodec/mips: Improve avc weighted mc msa functions
Replace generic with block size specific function.
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kaustubh Raste [Tue, 26 Sep 2017 05:10:14 +0000 (10:40 +0530)]
avcodec/mips: Removed generic function call in avc intra msa functions
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kaustubh Raste [Mon, 25 Sep 2017 12:38:35 +0000 (18:08 +0530)]
avcodec/mips: preload data in hevc sao edge 45 degree filter msa functions
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Wed, 27 Sep 2017 18:01:58 +0000 (15:01 -0300)]
Revert "Merge commit '
a97563c889fefd81ad6b3758471434d8c2e2e550 '"
This reverts commit
1985071e41f4df8fc693a564e25758676bba164a , reversing
changes made to
a901869c19ed14c7d3647901468bd1297c9f98c0 .
We autodetect libxcb, so this is not necessary.
Carl Eugen Hoyos [Wed, 27 Sep 2017 17:48:26 +0000 (19:48 +0200)]
lavf/version: Bump minor after dv1394 removal.
Josh de Kock [Tue, 26 Sep 2017 14:49:18 +0000 (15:49 +0100)]
lavd: remove deprecated dv1394 device
Support for this device has been removed in kernel since v2.6.37. dv1394 has been superseded by libiec61883 which is functionally equivalent.
Signed-off-by: Josh de Kock <josh@itanimul.li>
Signed-off-by: wm4 <nfxjfg@googlemail.com>
James Almer [Wed, 27 Sep 2017 15:46:57 +0000 (12:46 -0300)]
Merge commit '
a25dac976a4478331e4db86d44c3db4456c93eff '
* commit '
a25dac976a4478331e4db86d44c3db4456c93eff ':
Use bitstream_init8() where appropriate
This commit is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 27 Sep 2017 15:23:50 +0000 (12:23 -0300)]
Merge commit '
71a49fe25f2e4468fbbadbebef8d073b1b3cc1a5 '
* commit '
71a49fe25f2e4468fbbadbebef8d073b1b3cc1a5 ':
configure: Use cppflags check helper functions where appropriate
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 27 Sep 2017 14:54:11 +0000 (11:54 -0300)]
Merge commit '
0ce3761c781f2c2de40a5a8a99563878804f47cc '
* commit '
0ce3761c781f2c2de40a5a8a99563878804f47cc ':
configure: Add stdlib.h #include to CPPFLAGS check helper functions
Merged-by: James Almer <jamrial@gmail.com>
Tobias Rapp [Tue, 29 Aug 2017 12:45:13 +0000 (14:45 +0200)]
fate: add tests for psnr and ssim filter
Metadata filter output is passed through an Awk script comparing floats
against reference values with specified "fuzz" tolerance to account for
architectural differences (e.g. x86-32 vs. x86-64).
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Tobias Rapp [Wed, 27 Sep 2017 12:29:21 +0000 (14:29 +0200)]
avfilter/f_metadata: avoid trailing whitespace in filter output
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
James Almer [Tue, 26 Sep 2017 22:18:56 +0000 (19:18 -0300)]
Merge commit '
f7ec7f546f0021d28da284b024416b916b61c974 '
* commit '
f7ec7f546f0021d28da284b024416b916b61c974 ':
wma: Convert to the new bitstream reader
This commit is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 22:15:54 +0000 (19:15 -0300)]
Merge commit '
58d87e0f49bcbbc6f426328f53b657bae7430cd2 '
* commit '
58d87e0f49bcbbc6f426328f53b657bae7430cd2 ':
aarch64: vp9itxfm: Restructure the idct32 store macros
arm: vp9itxfm: Avoid .irp when it doesn't save any lines
This commit is a noop, see
31e41350d283febda7e91b92555854ca270e075e
52c7366c83aba4dc92ceedecbee592d629c98e29
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 22:09:57 +0000 (19:09 -0300)]
Revert "Merge commit '
66988320794a107f2a460eaa71dbd9fab8056842 '"
This reverts commit
740e557d6eac3b579dfed53ed92ae70e2089c77c , reversing
changes made to
932e28b13e9ae29262dfd28419b700e03716e85e .
The commit apparently broke builds with shared libs, and "suggesting"
the use of external libraries that need to be explicitly enable has
dubious usefulness anyway.
James Almer [Tue, 26 Sep 2017 21:50:30 +0000 (18:50 -0300)]
Merge commit '
8e67039c6312ba520945f2c01b7b14df056d5ed1 '
* commit '
8e67039c6312ba520945f2c01b7b14df056d5ed1 ':
asfdec: Use the ASF stream count when iterating
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 21:48:06 +0000 (18:48 -0300)]
Merge commit '
7abdd026df6a9a52d07d8174505b33cc89db7bf6 '
* commit '
7abdd026df6a9a52d07d8174505b33cc89db7bf6 ':
asm: Consistently uppercase SECTION markers
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 21:38:14 +0000 (18:38 -0300)]
Merge commit '
740b0bf03b4bb8b0a0e964750817ac0363a33c55 '
* commit '
740b0bf03b4bb8b0a0e964750817ac0363a33c55 ':
build: Ignore generated .version files
This commit is a noop, see
fbc304239fe6162d8da4ee7a519483f5ef79e7c2
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 21:34:25 +0000 (18:34 -0300)]
Merge commit '
15a92e0c402c830b607f905d6bf203b6cfb4fa8c '
* commit '
15a92e0c402c830b607f905d6bf203b6cfb4fa8c ':
rtmp: Correctly handle the Window Acknowledgement Size packets
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 21:08:25 +0000 (18:08 -0300)]
Merge commit '
a1a143adb0fd11c474221431417cff25db7d920f '
* commit '
a1a143adb0fd11c474221431417cff25db7d920f ':
rtmp: Rename packet types to closer match the spec
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 20:42:19 +0000 (17:42 -0300)]
Merge commit '
bcaedef1189a3531aa4dfb020627eb0133ffa89c '
* commit '
bcaedef1189a3531aa4dfb020627eb0133ffa89c ':
configure: Add require_cpp_condition() convenience function
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 20:29:57 +0000 (17:29 -0300)]
Merge commit '
aba7fdcc8baaed35e804c7882b70a848a0e566c7 '
* commit '
aba7fdcc8baaed35e804c7882b70a848a0e566c7 ':
configure: Add require_header() convenience function
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 20:23:16 +0000 (17:23 -0300)]
Merge commit '
a97563c889fefd81ad6b3758471434d8c2e2e550 '
* commit '
a97563c889fefd81ad6b3758471434d8c2e2e550 ':
configure: Simplify libxcb check
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 20:13:46 +0000 (17:13 -0300)]
Merge commit '
c29da01ac95ea2c8c5c4b3a312a33aaaa8fb7068 '
* commit '
c29da01ac95ea2c8c5c4b3a312a33aaaa8fb7068 ':
svq3: Convert to the new bitstream reader
This commit is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 20:11:48 +0000 (17:11 -0300)]
Merge commit '
acfa7a2178f08fd81b66279959cd55ec3ae237e2 '
* commit '
acfa7a2178f08fd81b66279959cd55ec3ae237e2 ':
configure: Drop weak dependencies on external libraries for webm muxer
This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 20:08:29 +0000 (17:08 -0300)]
Merge commit '
66988320794a107f2a460eaa71dbd9fab8056842 '
* commit '
66988320794a107f2a460eaa71dbd9fab8056842 ':
configure: Add proper weak dependency of drawtext filter on libfontconfig
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 20:01:21 +0000 (17:01 -0300)]
Merge commit '
24d5680bbc01fc124709d522d348572ad4672563 '
* commit '
24d5680bbc01fc124709d522d348572ad4672563 ':
configure: Simplify inline asm check with appropriate helper function
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 19:49:59 +0000 (16:49 -0300)]
Merge commit '
b3825723dceffc64240da7b0e562bd1fd024da26 '
* commit '
b3825723dceffc64240da7b0e562bd1fd024da26 ':
configure: Merge compiler/libc/os hacks sections
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 19:38:55 +0000 (16:38 -0300)]
Merge commit '
577326d430593a25456393a75212b95d1cd94131 '
* commit '
577326d430593a25456393a75212b95d1cd94131 ':
lavc: deprecate refcounted_frames field
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 19:27:43 +0000 (16:27 -0300)]
Merge commit '
3ad825793a43253154bed05827f27425fc0757df '
* commit '
3ad825793a43253154bed05827f27425fc0757df ':
hwcontext_cuda: implement frames_get_constraints
This commit is a noop,
c16fe1432d88f87a96be9e943e0f1229543ad61d
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 18:58:40 +0000 (15:58 -0300)]
Merge commit '
fd9212f2edfe9b107c3c08ba2df5fd2cba5ab9e3 '
* commit '
fd9212f2edfe9b107c3c08ba2df5fd2cba5ab9e3 ':
Mark some arrays that never change as const.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 18:44:19 +0000 (15:44 -0300)]
Merge commit '
b420a27e74750b60d2e064236afb10be06a38ace '
* commit '
b420a27e74750b60d2e064236afb10be06a38ace ':
avconv: allow -b to be used with streamcopy
This commit is a noop. We already have this functionality.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 18:06:10 +0000 (15:06 -0300)]
Merge commit '
ab2539bd374fe7ddbc6e2f058b62645cd5076192 '
* commit '
ab2539bd374fe7ddbc6e2f058b62645cd5076192 ':
ffv1: Convert to the new bitstream reader
h261dec: Convert to the new bitstream reader
shorten: Convert to the new bitstream reader
ralf: Convert to the new bitstream reader
loco: Convert to the new bitstream reader
fic: Convert to the new bitstream reader
dirac: Convert to the new bitstream reader
cavs: Convert to the new bitstream reader
aic: Convert to the new bitstream reader
golomb: Convert to the new bitstream reader
This commit is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 18:03:21 +0000 (15:03 -0300)]
Merge commit '
ab87af41636b081dd3562423999351b5444fa09e '
* commit '
ab87af41636b081dd3562423999351b5444fa09e ':
configure: Add proper weak dependency of avformat on network
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 17:59:58 +0000 (14:59 -0300)]
Merge commit '
612cc0712836af2f025b0c68b11da29b9f259d5a '
* commit '
612cc0712836af2f025b0c68b11da29b9f259d5a ':
pgssubdec: reset rle_data_len/rle_remaining_len on allocation error
This commit is a noop, see
842e98b4d83d8cf297e2bc2761f1f47eb89e49e4
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 17:48:22 +0000 (14:48 -0300)]
Merge commit '
708e84cda1bdbffb92847f3d6ccf6fbeb26d9948 '
* commit '
708e84cda1bdbffb92847f3d6ccf6fbeb26d9948 ':
mov: Avoid memcmp of uninitialised data
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 26 Sep 2017 17:43:29 +0000 (14:43 -0300)]
Merge commit '
ca62236a89f47bd871eaf69d8d9e837c93c55a6c '
* commit '
ca62236a89f47bd871eaf69d8d9e837c93c55a6c ':
vaapi_encode: Add VP8 support
vaapi_encode: Pass framerate parameters to driver
vaapi_h264: Enable VBR mode
vaapi_encode: Support VBR mode
This commit is a noop, see
ceb28c3cc4c7921935b48904db3c559eed1597fe
2201c02e6dc9f9652a8e27dec194915f05954ad0
be6546a4ff592785d039df6cbdd7659781d30b2c
d1acab8293054151157910eb081d5edcc7496e13
Merged-by: James Almer <jamrial@gmail.com>
Rodger Combs [Tue, 26 Sep 2017 17:13:54 +0000 (14:13 -0300)]
Merge commit '
c5c663541739cb813a2a5668ee8339b535b35d7d '
* commit '
c5c663541739cb813a2a5668ee8339b535b35d7d ':
doc: add dash muxer
Merged-by: Rodger Combs <rodger.combs@gmail.com>
Rodger Combs [Tue, 26 Sep 2017 17:13:09 +0000 (14:13 -0300)]
Merge commit '
7295b7373862ee54903b33d6ef3335531dfa93ad '
* commit '
7295b7373862ee54903b33d6ef3335531dfa93ad ':
dashenc: add webm support
Merged-by: Rodger Combs <rodger.combs@gmail.com>
Rodger Combs [Tue, 26 Sep 2017 17:12:19 +0000 (14:12 -0300)]
Merge commit '
01f1f017d831cf14617aaaeafcec3ae3a81efce7 '
* commit '
01f1f017d831cf14617aaaeafcec3ae3a81efce7 ':
dashenc: use avio_dynbuf instead of packet_write callback
Merged-by: Rodger Combs <rodger.combs@gmail.com>
Rodger Combs [Tue, 26 Sep 2017 17:11:50 +0000 (14:11 -0300)]
Merge commit '
dce2929efa8e82b0832a828f7e8cb81ff8c20a4e '
* commit '
dce2929efa8e82b0832a828f7e8cb81ff8c20a4e ':
dashenc: copy language and role metadata from streams assigned to sets
Merged-by: Rodger Combs <rodger.combs@gmail.com>
Rodger Combs [Tue, 26 Sep 2017 17:11:25 +0000 (14:11 -0300)]
Merge commit '
ca9bc9de690258d4761a19b0df6e9c9113b80115 '
* commit '
ca9bc9de690258d4761a19b0df6e9c9113b80115 ':
dashenc: default to one AdaptationSet per stream
Merged-by: Rodger Combs <rodger.combs@gmail.com>
Rodger Combs [Tue, 26 Sep 2017 17:11:02 +0000 (14:11 -0300)]
Merge commit '
efd2fc41b3f0749f9715d50b581f22bbaa8c5b99 '
* commit '
efd2fc41b3f0749f9715d50b581f22bbaa8c5b99 ':
dashenc: allow assigning all streams of a media type to an AdaptationSet
Merged-by: Rodger Combs <rodger.combs@gmail.com>
Rodger Combs [Tue, 26 Sep 2017 17:10:30 +0000 (14:10 -0300)]
Merge commit '
3d23a5f96ad72961c14ba3a0c2add8f2ab374b61 '
* commit '
3d23a5f96ad72961c14ba3a0c2add8f2ab374b61 ':
dashenc: add support for assigning streams to AdaptationSets
Merged-by: Rodger Combs <rodger.combs@gmail.com>
Rodger Combs [Tue, 26 Sep 2017 17:02:44 +0000 (14:02 -0300)]
Merge commit '
9df9309d233f59d9706444a1e24ac24139f2640d '
* commit '
9df9309d233f59d9706444a1e24ac24139f2640d ':
dashenc: calculate stream bitrate from first segment if not available
Merged-by: Rodger Combs <rodger.combs@gmail.com>
James Almer [Tue, 26 Sep 2017 16:59:56 +0000 (13:59 -0300)]
Revert "lavf/dashenc: update bitrates on dash_write_trailer"
This reverts commit
89c0fda5f43d8a3d3a1c538ff8d72e6737bc7d8e .
A different solution will be committed instead.
Signed-off-by: James Almer <jamrial@gmail.com>
Moritz Barsnick [Tue, 26 Sep 2017 11:25:54 +0000 (13:25 +0200)]
lavf/tls_gnutls: fix warnings from version check
The GnuTLS version is checked through the macro GNUTLS_VERSION_NUMBER,
but this wasn't introduced before 2.7.2. Building with older versions
of GnuTLS (using icc) warns:
src/libavformat/tls_gnutls.c(38): warning #193: zero used for undefined preprocessing identifier "GNUTLS_VERSION_NUMBER"
#if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00
This adds a fallback to the older, deprecated LIBGNUTLS_VERSION_NUMBER
macro.
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Moritz Barsnick [Tue, 26 Sep 2017 11:25:53 +0000 (13:25 +0200)]
lavf/tls_gnutls: fix compilation with GnuTLS 2.x
Commit
598e41684066feba701d19ca7443d24b9e5efa77 added use of
GNUTLS_E_PREMATURE_TERMINATION, which wasn't introduced to GnuTLS
before 2.99.x / 3.x. This fixes compilation with older versions.
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Frédéric Devernay [Tue, 12 Sep 2017 13:26:15 +0000 (15:26 +0200)]
avcodec/dnxhdenc: fix DNxHR 444 encoding crashes
Fixes #6649.
James Almer [Tue, 26 Sep 2017 02:14:14 +0000 (23:14 -0300)]
avformat/img2enc: remove av_dup_packet() call
It's unnecessary after a call to av_packet_ref().
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 23 Sep 2017 23:32:42 +0000 (20:32 -0300)]
ffplay: replace use of av_copy_packet()
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 23 Sep 2017 23:30:13 +0000 (20:30 -0300)]
avformat: replace all uses of av_copy_packet()
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 23 Sep 2017 18:59:56 +0000 (15:59 -0300)]
avcodec/avpacket: deprecate av_copy_packet()
It does the same thing as av_packet_ref().
Signed-off-by: James Almer <jamrial@gmail.com>
Thomas Mundt [Tue, 19 Sep 2017 20:49:09 +0000 (22:49 +0200)]
avfilter/interlace: rename two variables for consistency
Signed-off-by: Thomas Mundt <tmundt75@gmail.com>
Paul B Mahol [Mon, 25 Sep 2017 10:12:13 +0000 (12:12 +0200)]
avfilter/af_headphone: increase max ir length
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paras Chadha [Fri, 15 Sep 2017 21:54:07 +0000 (03:24 +0530)]
fate/fits: add missing png & gif dependencies
Signed-off-by: Paras Chadha <paraschadha18@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Martin Vignali [Sat, 23 Sep 2017 19:50:54 +0000 (21:50 +0200)]
libavcodec/hapdec : add support HapAlphaOnly
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Martin Vignali [Sat, 23 Sep 2017 19:43:44 +0000 (21:43 +0200)]
libavformat : add mov dataformat tag for HapAlphaOnly and HapQAlpha
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 22 Sep 2017 18:45:27 +0000 (20:45 +0200)]
avcodec/takdec: Fix integer overflow in decode_lpc()
Fixes: runtime error: signed integer overflow: 16748560 + 2143729712 cannot be represented in type 'int'
Fixes: 3202/clusterfuzz-testcase-minimized-4988291642294272
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 22 Sep 2017 18:45:28 +0000 (20:45 +0200)]
avcodec/proresdec2: Check bits in DECODE_CODEWORD(), fixes invalid shift
Fixes: runtime error: shift exponent 42 is too large for 32-bit type 'unsigned int'
Fixes: 3410/clusterfuzz-testcase-minimized-5313377960198144
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 22 Sep 2017 18:45:26 +0000 (20:45 +0200)]
avcodec/takdec: Fix integer overflows in decode_subframe()
Fixes: runtime error: signed integer overflow: -1562477869 + -691460395 cannot be represented in type 'int'
Fixes: 3196/clusterfuzz-testcase-minimized-4528307146063872
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Jörn Heusipp [Sun, 17 Sep 2017 13:35:50 +0000 (15:35 +0200)]
avformat/libopenmpt: Query duration and metadata after selecting subsong
Duration depends on the selected subsong and thus must be queried after
selecting the subsong. There is no compelling reason to query other
metadata earlier either.
Tested with libopenmpt version: 0.2.8760-beta27
Libopenmpt configure options: --without-ogg --without-vorbis
--without-vorbisfile --without-portaudio --without-portaudiocpp
--without-mpg123 --without-pulseaudio --without-sndfile --without-flac
Signed-off-by: Jörn Heusipp <osmanx@problemloesungsmaschine.de>
Signed-off-by: Josh de Kock <josh@itanimul.li>
Kaustubh Raste [Thu, 21 Sep 2017 13:59:39 +0000 (19:29 +0530)]
avcodec/mips: Improve avc chroma horiz mc msa functions
Replace generic with block size specific function.
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kaustubh Raste [Thu, 21 Sep 2017 13:32:30 +0000 (19:02 +0530)]
avcodec/mips: Unrolled loops avc intra msa functions
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kaustubh Raste [Thu, 21 Sep 2017 08:15:34 +0000 (13:45 +0530)]
avcodec/mips: Improve hevc uni-w copy mc msa functions
Load the specific destination bytes instead of MSA load and pack.
Pack the data to half word before clipping.
Use immediate unsigned saturation for clip to max saving one vector register.
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 22 Sep 2017 23:44:27 +0000 (01:44 +0200)]
avcodec/flacenc: Replace "return -1" by named constant
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 23 Sep 2017 00:19:25 +0000 (02:19 +0200)]
avcodec/snowenc: Replace "return -1" by named constants
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Jaroslav Beran [Wed, 20 Sep 2017 13:14:54 +0000 (15:14 +0200)]
libavdevice/v4l2: fix invalid access to struct v4l2_buffer
In case we are short of queued buffers, at first v4l2_buffer was enqueued to kernel so it's not owned by
user-space anymore. After that it's timestamp field was read, but it might be overwritten by driver at
that moment. It resulted in invalid timestamp sometimes.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Sat, 23 Sep 2017 23:13:58 +0000 (20:13 -0300)]
ffplay: zero initialize copy avpacket
Prevents potential use of uninitialized stack.
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 23 Sep 2017 22:37:21 +0000 (19:37 -0300)]
avformat/mpeg: zero initialize idx_pkt
Prevents use of uninitialized stack.
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 23 Sep 2017 21:12:56 +0000 (18:12 -0300)]
avcodec/v4l2_m2m: add missing header inclusions
Should fix checkheaders on systems where v4l2_m2m is enabled.
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 23 Sep 2017 21:08:07 +0000 (18:08 -0300)]
avcodec/Makefile: skip v4l2_m2m headers if needed
Fixes checkheaders on systems where v4l2_m2m is unavailable.
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 23 Sep 2017 20:50:58 +0000 (17:50 -0300)]
avcodec/frame_thread_encoder: use av_packet_alloc()
Signed-off-by: James Almer <jamrial@gmail.com>
Thomas Mundt [Tue, 19 Sep 2017 20:23:23 +0000 (22:23 +0200)]
avfilter/interlace: add support for 10 and 12 bit
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Thomas Mundt <tmundt75@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Thomas Mundt [Mon, 18 Sep 2017 21:57:17 +0000 (23:57 +0200)]
avfilter/tinterlace: use drawutils for pad mode
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Thomas Mundt <tmundt75@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Marton Balint [Thu, 7 Sep 2017 14:17:59 +0000 (16:17 +0200)]
avformat/mxfdec: use the common packet pts setter function for opatom files
Fixes ticket #6631.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Thu, 7 Sep 2017 14:09:13 +0000 (16:09 +0200)]
avformat/mxfdec: factorize packet pts setter function
Signed-off-by: Marton Balint <cus@passwd.hu>