]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Fri, 10 Jul 2015 14:35:44 +0000 (16:35 +0200)]
avformat/brstm: Remove unused variable
Fixes "libavformat/brstm.c:128:35: warning: variable info_size set but not used"
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 11 Jul 2015 22:00:21 +0000 (00:00 +0200)]
avformat/yuv4mpegdec: Use 64bit for file offset
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 11 Jul 2015 21:35:16 +0000 (23:35 +0200)]
avcodec/utils: Assert that the pointer is set when size is in ff_fast_malloc()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 11 Jul 2015 21:08:08 +0000 (23:08 +0200)]
avcodec/utils: Avoid undefined void casts in ff_fast_malloc()
based on code from libavutil/mem.c
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 11 Jul 2015 20:47:09 +0000 (22:47 +0200)]
avutil/mem: Fix potential overflow in overallocation code
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 11 Jul 2015 20:46:44 +0000 (22:46 +0200)]
avcodec/utils: Fix potential overflow in overallocation code
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Fri, 10 Jul 2015 18:04:25 +0000 (18:04 +0000)]
fate: add tests for w3fdif filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 11 Jul 2015 19:31:04 +0000 (19:31 +0000)]
avformat/yuv4mpegdec: remove unused variable
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Ronald S. Bultje [Sat, 11 Jul 2015 15:21:17 +0000 (11:21 -0400)]
vf_psnr: fix rgb channel order mixup in final log message.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Ronald S. Bultje [Sat, 11 Jul 2015 11:22:47 +0000 (07:22 -0400)]
vf_psnr: always calculate MSE over full pixel range.
This makes the output compatible with that of pretty much any other
tool that calculates PSNR.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 11 Jul 2015 12:49:55 +0000 (14:49 +0200)]
avformat/yuv4mpegdec: Remove unused variables
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Ronald S. Bultje [Sat, 11 Jul 2015 01:15:35 +0000 (21:15 -0400)]
yuv4mpeg: add rough duration estimate and seeking.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Ronald S. Bultje [Sat, 11 Jul 2015 02:47:24 +0000 (22:47 -0400)]
vF_psnr: move set_meta() calls out of loop.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 11 Jul 2015 10:22:44 +0000 (12:22 +0200)]
Merge commit '
87f98a2b9d4c7218ad82bb45347a53b65e5244f3 '
* commit '
87f98a2b9d4c7218ad82bb45347a53b65e5244f3 ':
fbdev: Support the RGB565 colour space.
Conflicts:
libavdevice/fbdev_dec.c
See:
43d36599fe3330913c6be9da5519dee048263dc9
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Dan Flett [Thu, 11 Jul 2013 16:16:07 +0000 (18:16 +0200)]
fbdev: Support the RGB565 colour space.
Tested on a Raspberry Pi.
Signed-off-by: Martin Storsjö <martin@martin.st>
Ronald S. Bultje [Sat, 11 Jul 2015 01:42:26 +0000 (21:42 -0400)]
vf_psnr: add channel weighting based on chroma subsampling.
Also add per-channel psnr stream averages to final log message.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 10 Jul 2015 22:37:56 +0000 (00:37 +0200)]
Merge commit '
1410eeb6ea6bc5784e40032430afcdf54a79aedb '
* commit '
1410eeb6ea6bc5784e40032430afcdf54a79aedb ':
imc: Use correct position for flcoeffs2 calculation
See:
75fd5ce4c1c0b2d96d71c74b650cefaaef519d27
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 10 Jul 2015 22:05:40 +0000 (00:05 +0200)]
avcodec/mpeg4videodec: Check P cbpy
Fixes undefined behavior
Fixes: signal_sigsegv_c3097a_991_xtrem_e2_m64q15_a32sxx.3gp
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Andreas Cadhalpun [Fri, 10 Jul 2015 19:50:50 +0000 (21:50 +0200)]
imc: use correct position for flcoeffs2 calculation
flcoeffs2[pos] should be the log2 of flcoeffs1[pos].
flcoeffs1[0] can be 0 here, thus flcoeffs2[pos] gets set to -inf,
causing problems further down.
This seems to have been copied from imc_decode_level_coefficients in
commit
4eb4bb3 without updating the position.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Michael Niedermayer [Fri, 10 Jul 2015 21:34:53 +0000 (23:34 +0200)]
avfilter/vf_ssim: Mark constant tables as const
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 10 Jul 2015 21:17:42 +0000 (23:17 +0200)]
avcodec/j2kenc: remove unused variable
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Andreas Cadhalpun [Fri, 10 Jul 2015 19:59:32 +0000 (21:59 +0200)]
imc: Use correct position for flcoeffs2 calculation
flcoeffs2[pos] should be the log2 of flcoeffs1[pos].
flcoeffs1[0] can be 0 here, thus flcoeffs2[pos] gets set to -inf,
causing problems further down.
This seems to have been copied from imc_decode_level_coefficients in
commit
4eb4bb3 without updating the position.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Andreas Cadhalpun [Fri, 10 Jul 2015 17:41:43 +0000 (19:41 +0200)]
hevc: check slice address length
It is used as get_bits argument and reading 0 bits isn't supported.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Michael Niedermayer [Fri, 10 Jul 2015 18:47:42 +0000 (20:47 +0200)]
Merge commit '
872fab4a3df48e7e6484333ee2228c684e319634 '
* commit '
872fab4a3df48e7e6484333ee2228c684e319634 ':
asfdec: Fix reading from the pipe
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 10 Jul 2015 16:31:42 +0000 (18:31 +0200)]
avcodec/utils: Document 32 min for h264 width
Suggested-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 10 Jul 2015 14:54:51 +0000 (16:54 +0200)]
avcodec/g2meet: Check R/G/B values in epic_decode_pixel_pred()
Fixes: asan_double-free_d34593_861_smp3.wmv
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Andreas Cadhalpun [Thu, 9 Jul 2015 17:50:34 +0000 (19:50 +0200)]
snow: remove an obsolete av_assert2
It asserts that the frame linesize is larger than 37, but it can be
smaller and decoding such frames works.
Before commit
cc884a35 src_stride > 7*MB_SIZE was necessary, because the
blocks were interleaved in the tmp buffer and the last block was added
with an offset of 6*MB_SIZE.
It was changed for src_stride <= 7*MB_SIZE to write the blocks
sequentially, hence the larger tmp_step.
After that the assert was only necessary to make sure that the buffer
remained large enough.
Since commit
bd2b6b33 s->scratchbuf is used as tmp buffer.
As part of commit
86e107a7 the minimal scratchbuf size was increased to
256*7*MB_SIZE, which is enough for any src_stride <= 7*MB_SIZE.
Also add a comment explaining the tmp_step calculation.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Michael Niedermayer [Fri, 10 Jul 2015 00:01:17 +0000 (02:01 +0200)]
avcodec/utils: use a minimum 32pixel width in avcodec_align_dimensions2() for H.264
Fixes Assertion failure
Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Jul 2015 11:21:18 +0000 (13:21 +0200)]
avcodec/motion_est_template: Fix undefined behavior in small_diamond_search()
Fixes: asan_heap-oob_394322e_138_cov_4265020547_CVPCMNL1_SVA_C.264
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Alexandra Hájková [Fri, 10 Jul 2015 10:39:58 +0000 (12:39 +0200)]
asfdec: Fix reading from the pipe
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Paul B Mahol [Fri, 10 Jul 2015 10:45:51 +0000 (10:45 +0000)]
avfilter/vf_removegrain: clip to uint16 instead to uint8
This is how original filter behaves.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 10 Jul 2015 02:19:07 +0000 (04:19 +0200)]
avcodec/libopenh264enc: Do not truncate frame rate
Suggested-by: Gregory J Wolfe <gregory.wolfe@kodakalaris.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Jul 2015 00:30:41 +0000 (02:30 +0200)]
Merge commit '
67c884eb07c7e9f2cb72bb8d447d945e5ac8cac7 '
* commit '
67c884eb07c7e9f2cb72bb8d447d945e5ac8cac7 ':
libvpx: Add the library header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 10 Jul 2015 00:15:54 +0000 (02:15 +0200)]
Merge commit '
461b45efd04859b2672238bc8a6ecab9e9a14948 '
* commit '
461b45efd04859b2672238bc8a6ecab9e9a14948 ':
lavc: Add nvenc.h to the skipheader
Conflicts:
libavcodec/Makefile
No change as there is no nvenc.h in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ivan Uskov [Thu, 9 Jul 2015 19:01:00 +0000 (22:01 +0300)]
libavcodec/qsvenc.c: improving handling for return codes of MFXVideoENCODE_EncodeFrameAsync
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 9 Jul 2015 20:16:15 +0000 (22:16 +0200)]
avcodec/mpegvideo: Clear pointers in ff_mpv_common_init()
This ensures that no stale pointers leak through on any path
Fixes: signal_sigsegv_c3097a_991_xtrem_e2_m64q15_a32sxx.3gp
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Thu, 9 Jul 2015 19:36:19 +0000 (21:36 +0200)]
libvpx: Add the library header
Unbreak make checkheaders
Luca Barbato [Thu, 9 Jul 2015 12:42:34 +0000 (14:42 +0200)]
lavc: Add nvenc.h to the skipheader
Unbreak make checkheaders
Paul B Mahol [Thu, 9 Jul 2015 08:00:50 +0000 (08:00 +0000)]
fate: add removegrain tests
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Carl Eugen Hoyos [Thu, 9 Jul 2015 18:03:38 +0000 (20:03 +0200)]
lavf/rtpenc_jpeg: Error out for non-standard Huffman tables.
Related to ticket #3823.
Carl Eugen Hoyos [Thu, 9 Jul 2015 18:00:31 +0000 (20:00 +0200)]
lavf/rtpenc_jpeg: Do not check the table number when checking precision.
Carl Eugen Hoyos [Thu, 9 Jul 2015 17:58:22 +0000 (19:58 +0200)]
ffmpeg: Use av_log to print benchmark output.
Carl Eugen Hoyos [Thu, 9 Jul 2015 17:52:06 +0000 (19:52 +0200)]
Cosmetics: Reindent after last commit.
Carl Eugen Hoyos [Thu, 9 Jul 2015 17:49:37 +0000 (19:49 +0200)]
lavf/matroskaenc: Do not needlessly allocate memory for cuepoints.
Fixes ticket #4690.
Ivan Uskov [Thu, 9 Jul 2015 13:49:36 +0000 (16:49 +0300)]
libavcodec/qsvenc.c: Fix for too agressive height alignment during frame encoding which may be reason of superflous frame copying.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 9 Jul 2015 14:49:09 +0000 (16:49 +0200)]
avcodec/qsvenc_hevc: Attempt to fix error: too few arguments to function ff_hevc_extract_rbsp
Found-by: Ivan Uskov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jovan Zelincevic [Tue, 30 Jun 2015 09:53:06 +0000 (11:53 +0200)]
libavcodec: Implementation of AAC_fixed_decoder (LC-module) [4/4]
Build system modified
There are several warnings occurring during build after this patch is
applied. The cause of most of these warnings is in that some definitions
needed here are logical part of sbr module and are added in later patches.
When this patches are applied these warnings stop occurring.
The only warning that is added here and is not fixed with later patches
is warning that warns that type mismatch for table ff_aac_eld_window_480.
The reason for this warning is in that ER AAC ELD 480 is not integrated in
to the fixed point implementation at this moment and there is no fixed point
version of this table.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Djordje Pesut [Tue, 30 Jun 2015 09:53:05 +0000 (11:53 +0200)]
libavcodec: Implementation of AAC_fixed_decoder (LC-module) [3/4]
Add fixed point implementation
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jovan Zelincevic [Tue, 30 Jun 2015 09:53:04 +0000 (11:53 +0200)]
libavcodec: Implementation of AAC_fixed_decoder (LC-module) [2/4]
Add fixed point implementation of functions for generating tables
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jovan Zelincevic [Tue, 30 Jun 2015 09:53:03 +0000 (11:53 +0200)]
libavcodec: Implementation of AAC_fixed_decoder (LC-module) [1/4]
Move existing code to the new template files
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 9 Jul 2015 11:02:07 +0000 (13:02 +0200)]
avcodec/hevc_ps: Remove gotos from ff_hevc_parse_sps()
They are currently unnecessary
Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 9 Jul 2015 10:39:54 +0000 (12:39 +0200)]
Merge commit '
84b223cc6d6ed4cc8bd295457a90f7c94a9dd784 '
* commit '
84b223cc6d6ed4cc8bd295457a90f7c94a9dd784 ':
configure: Make the new qsv encoder depend on libmfx
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 9 Jul 2015 10:27:55 +0000 (12:27 +0200)]
Merge commit '
d1a6cb195f610978ba5d2351e60f938f7f261d59 '
* commit '
d1a6cb195f610978ba5d2351e60f938f7f261d59 ':
x86: Serialize rdtsc in read_time()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 9 Jul 2015 10:18:21 +0000 (12:18 +0200)]
Merge commit '
40af330adf7fde8073271cf2b41ff9adc4c2bba9 '
* commit '
40af330adf7fde8073271cf2b41ff9adc4c2bba9 ':
avconv: vda: Unlock the pixel buffer once it is accessed
See:
c06fdacc3dc706e70d953917fea845532d3703ca
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 9 Jul 2015 10:11:10 +0000 (12:11 +0200)]
Merge commit '
8fcd121b823caeadbe7597c9ae9229f6f164f949 '
* commit '
8fcd121b823caeadbe7597c9ae9229f6f164f949 ':
doc: Use the succinct syntax for the channelmap example
Conflicts:
doc/filters.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 9 Jul 2015 09:55:44 +0000 (11:55 +0200)]
configure: Fix build without libmfx
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 9 Jul 2015 09:52:05 +0000 (11:52 +0200)]
Merge commit '
66acb76bb0492b263215ca9b4d927a7be39ace02 '
* commit '
66acb76bb0492b263215ca9b4d927a7be39ace02 ':
lavc: add Intel libmfx-based HEVC encoder
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/qsv.c
libavcodec/qsvenc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 9 Jul 2015 09:24:21 +0000 (11:24 +0200)]
configure: Fix build without libmfx
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 9 Jul 2015 09:17:12 +0000 (11:17 +0200)]
Merge commit '
3a85397e8bb477eb34678d9edc52893f57003226 '
* commit '
3a85397e8bb477eb34678d9edc52893f57003226 ':
lavc: add Intel libmfx-based MPEG2 encoder
Conflicts:
Changelog
configure
libavcodec/allcodecs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 9 Jul 2015 03:04:13 +0000 (05:04 +0200)]
Merge commit '
69ab9f53f901eac6a649e22d28cf093357870627 '
* commit '
69ab9f53f901eac6a649e22d28cf093357870627 ':
hevc: split bitstream unescaping to a separate file
Conflicts:
libavcodec/Makefile
libavcodec/hevc.c
See:
afa93d198aaf2cc661c4df6d4095cd030265d30a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 9 Jul 2015 02:41:08 +0000 (04:41 +0200)]
avcodec/hevc_ps: Do not return success on failures in ff_hevc_parse_sps()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 9 Jul 2015 02:19:42 +0000 (04:19 +0200)]
Merge commit '
fd124d8357b1becfde3ac8d5e3320127cf97a5b7 '
* commit '
fd124d8357b1becfde3ac8d5e3320127cf97a5b7 ':
hevc_ps: split the code for parsing the SPS and exporting it into the context
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 9 Jul 2015 00:16:25 +0000 (21:16 -0300)]
avcodev/libdcadec: implement request_channel_layout
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Thu, 9 Jul 2015 01:53:51 +0000 (03:53 +0200)]
Merge commit '
0e7c0ec344f542e68e3cc9680e8d41dffeffdb4e '
* commit '
0e7c0ec344f542e68e3cc9680e8d41dffeffdb4e ':
lavf/hevc: pad the RBSP buffer as required by the bistream reader
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Chris Watkins [Tue, 7 Jul 2015 17:23:44 +0000 (10:23 -0700)]
oggparsedirac: check return value of init_get_bits
If init_get_bits fails the GetBitContext is invalid and must not be
used. Check the return value in dirac_header and propogate the error.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ivan Uskov [Tue, 7 Jul 2015 17:33:36 +0000 (20:33 +0300)]
libavcodec/qsvenc.c: fix incorrect loop condition.
For example, the encoder may return MFX_WRN_INCOMPATIBLE_VIDEO_PARAM warning
i.e. ret==5 old loop implementation will repeat several times until output buffer
overflow. New implementation explicitly uses loop only for device busy case.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
compn [Wed, 8 Jul 2015 18:24:46 +0000 (14:24 -0400)]
avformat/movenc: fix mime-types in movenc.c
https://developer.apple.com/library/ios/documentation/AppleApplications/Reference/SafariWebContent/CreatingContentforSafarioniPhone/CreatingContentforSafarioniPhone.html
says video/mp4
suggested by BBB on irc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Jul 2015 23:17:49 +0000 (01:17 +0200)]
Merge commit '
1761ab838c75223a6b97d8c0720d09275374c53d '
* commit '
1761ab838c75223a6b97d8c0720d09275374c53d ':
lavc: Deprecate avctx.rc_strategy
Conflicts:
libavcodec/mpegvideo.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Jul 2015 22:49:20 +0000 (00:49 +0200)]
Merge commit '
02b7c630875c0bc63cee5ec597aa33baf9bf4e20 '
* commit '
02b7c630875c0bc63cee5ec597aa33baf9bf4e20 ':
h261: Signal freeze picture release for intra frames
Conflicts:
tests/ref/vsynth/vsynth1-h261
tests/ref/vsynth/vsynth2-h261
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Jul 2015 22:33:52 +0000 (00:33 +0200)]
Merge commit '
dc1de0b958836545339611e9c050a1d4fdded263 '
* commit '
dc1de0b958836545339611e9c050a1d4fdded263 ':
h261: Set 'still image mode off' in picture header
Conflicts:
tests/ref/vsynth/vsynth1-h261
tests/ref/vsynth/vsynth2-h261
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Jul 2015 22:20:10 +0000 (00:20 +0200)]
Merge commit '
c8b8271379b200c5c6fa89ca995f90f97f55c2c5 '
* commit '
c8b8271379b200c5c6fa89ca995f90f97f55c2c5 ':
xcbgrab: Explicitly include xcb/shape.h
See:
54170a33c2c97b0f50347f57e8f0f2ea681dca1d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Wed, 8 Jul 2015 22:18:19 +0000 (00:18 +0200)]
configure: Make the new qsv encoder depend on libmfx
Found-by: kropping
Michael Niedermayer [Wed, 8 Jul 2015 22:10:20 +0000 (00:10 +0200)]
Merge commit '
161a301d44274645c2272855dac3e4664f935603 '
* commit '
161a301d44274645c2272855dac3e4664f935603 ':
mpjpeg: Write the Content-length
Conflicts:
libavformat/mpjpeg.c
See:
0d2f4eedc8a46892471c51cbc7a78cd9a489771a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Henrik Gramner [Wed, 8 Jul 2015 20:33:53 +0000 (22:33 +0200)]
x86: Serialize rdtsc in read_time()
Improves the accuracy of measurements, especially in short sections.
To quote the Intel 64 and IA-32 Architectures Software Developer's Manual:
"The RDTSC instruction is not a serializing instruction. It does not necessarily
wait until all previous instructions have been executed before reading the counter.
Similarly, subsequent instructions may begin execution before the read operation
is performed. If software requires RDTSC to be executed only after all previous
instructions have completed locally, it can either use RDTSCP (if the processor
supports that instruction) or execute the sequence LFENCE;RDTSC."
SSE2 is a requirement for lfence so only use it on SSE2-capable systems.
Prefer lfence;rdtsc over rdtscp since rdtscp is supported on fewer systems.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Sebastien Zwickert [Wed, 8 Jul 2015 18:23:37 +0000 (20:23 +0200)]
avconv: vda: Unlock the pixel buffer once it is accessed
Avoid possible issues with memmapped hardware buffers in
case VDA is not doing a conversion on behalf of the user
and make the code more proper as working example.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Wed, 8 Jul 2015 14:14:47 +0000 (16:14 +0200)]
doc: Use the succinct syntax for the channelmap example
Mixing succinct and long syntax does not work.
Michael Niedermayer [Wed, 8 Jul 2015 21:53:08 +0000 (23:53 +0200)]
Merge commit '
d09b4cce21cdad5ef2855698395ffd6e37445212 '
* commit '
d09b4cce21cdad5ef2855698395ffd6e37445212 ':
mpjpeg: Simplify using avio_printf
Conflicts:
libavformat/mpjpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Tue, 16 Jun 2015 16:22:11 +0000 (18:22 +0200)]
lavc: add Intel libmfx-based HEVC encoder
Anton Khirnov [Tue, 16 Jun 2015 16:22:11 +0000 (18:22 +0200)]
lavc: add Intel libmfx-based MPEG2 encoder
Anton Khirnov [Tue, 30 Jun 2015 13:19:52 +0000 (15:19 +0200)]
hevc: split bitstream unescaping to a separate file
It will be useful in the QSV HEVC encoder.
Anton Khirnov [Tue, 30 Jun 2015 12:51:53 +0000 (14:51 +0200)]
hevc_ps: split the code for parsing the SPS and exporting it into the context
This will be useful in the later commits, where we want to parse an SPS
without having a whole decoding context.
Anton Khirnov [Tue, 30 Jun 2015 18:28:23 +0000 (20:28 +0200)]
lavf/hevc: pad the RBSP buffer as required by the bistream reader
Paul B Mahol [Sat, 4 Jul 2015 20:19:05 +0000 (20:19 +0000)]
avfilter: add removegrain
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 8 Jul 2015 15:49:00 +0000 (17:49 +0200)]
avcodec/h264_slice: Fix container cropping
Fixes out of array read
Fixes: asan_heap-oob_394322e_138_cov_4265020547_CVPCMNL1_SVA_C.264
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Fri, 3 Jul 2015 15:46:44 +0000 (16:46 +0100)]
lavc: Deprecate avctx.rc_strategy
Only used by libxvid in ratecontrol module, so move it to a codec
private option.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Michael Niedermayer [Wed, 8 Jul 2015 13:38:37 +0000 (15:38 +0200)]
avcodec/g2meet: Clear pointers after deallocation
Fixes double free
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ganesh Ajjanagadde [Sat, 27 Jun 2015 16:27:59 +0000 (12:27 -0400)]
build: add LDLIBFLAGS
Fixes Ticket4673
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Jul 2015 02:23:45 +0000 (04:23 +0200)]
avcodec/utils: Check values in apply_param_change()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Jul 2015 09:30:21 +0000 (11:30 +0200)]
avformat/swfdec: Fix "}else" style
Found-by: durandal_170
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 6 Jul 2015 14:07:52 +0000 (14:07 +0000)]
avfilter/vf_colormatrix: add yuv444p support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 8 Jul 2015 00:43:02 +0000 (02:43 +0200)]
avformat/swfdec: Do not error out on pixel format changes
Instead print an error and continue
Fixes Ticket4702
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 7 Jul 2015 22:49:04 +0000 (00:49 +0200)]
videodsp: assert that linesize is larger than width
Suggested-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Thu, 2 Jul 2015 22:02:44 +0000 (00:02 +0200)]
wmalosslessdec: reset frame->nb_samples on packet loss
Otherwise a frame with non-zero nb_samples but without any data can be
returned.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Thu, 2 Jul 2015 22:01:56 +0000 (00:01 +0200)]
wmalosslessdec: avoid reading 0 bits with get_bits
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Rostislav Pehlivanov [Sun, 5 Jul 2015 15:48:19 +0000 (16:48 +0100)]
aacenc: fix option descriptions
Since the new PNS implementation has been merged and is no longer considered
proof of concept (as it's much more complex and better than the previous), change
the comments to reflect that. We need people testing it (since all AAC profiles
require it to be on by default) and having it tagged as proof of concept might drive some away.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 7 Jul 2015 17:29:08 +0000 (14:29 -0300)]
avcodec/libdcadec: export matrix encoding side data
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Chris Watkins [Tue, 7 Jul 2015 17:40:27 +0000 (10:40 -0700)]
Put a space between string literals and macros.
When compiling libavutil/internal.h as C++11, clang warns that a space
is required between a string literal and an identifier. Put spaces
in concatenations of string literals and EXTERN_PREFIX.
Signed-off-by: Chris Watkins <watk@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
周晓勇 [Mon, 6 Jul 2015 09:16:49 +0000 (17:16 +0800)]
configure: loongson enabled local aligned 32
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stian Selnes [Tue, 2 Dec 2014 17:55:13 +0000 (18:55 +0100)]
h261: Signal freeze picture release for intra frames
Freeze picture release should be set to 1 when we're responding to a
fast update request. For simplicity we set it for all intra frames,
including those that starts a GOP.
Fixes issue where Tandberg MXP1700 does not recover from packet loss
state since it's waiting for the freeze picture relase indication.
Bug-Id: 873
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Stian Selnes [Fri, 12 Dec 2014 15:08:19 +0000 (16:08 +0100)]
h261: Set 'still image mode off' in picture header
Ref H.261 recommendation section 4.2.1.3, setting the still image flag
to 1 disables still image mode. Some decoders require this in order to
decode the bitstream as normal video.
Fixes H.261 calls to Cisco E20.
Also, reserved (aka spare) bits should be set to 1 unless specified
otherwise.
Bug-Id: 872
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>