]>
git.sesse.net Git - ffmpeg/log
Carl Eugen Hoyos [Tue, 5 Jan 2016 20:34:35 +0000 (21:34 +0100)]
lavf/matroskaenc: Assume 48kHz sample rate for Opus initial padding.
Analyzed by Timothy B. Terriberry in Mozilla bug
1227153 .
Fixes ticket #5121.
Michael Niedermayer [Tue, 5 Jan 2016 13:41:04 +0000 (14:41 +0100)]
avcodec/motion_est: Fix mv_penalty table size
Fixes out of array read
Found-by: Tyson Smith <twsmith@mozilla.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Aman Gupta [Tue, 5 Jan 2016 03:28:01 +0000 (19:28 -0800)]
libavcodec/ccaption_dec: remove unnecessary include
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Tue, 5 Jan 2016 12:53:25 +0000 (13:53 +0100)]
avfilter/avf_avectorscope: add line drawing support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 5 Jan 2016 10:37:11 +0000 (11:37 +0100)]
avfilter/window_func: add tukey window function
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 5 Jan 2016 09:05:14 +0000 (10:05 +0100)]
avfilter/avf_showspectrum: use av_clip/lrintf
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 4 Jan 2016 16:13:00 +0000 (17:13 +0100)]
avfilter/avf_showspectrum: add yet another color map
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 5 Jan 2016 02:08:09 +0000 (03:08 +0100)]
avcodec/dxv: Check idx in dxv_decompress_dxt5()
Fixes potential out of array read
No testcase available
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 5 Jan 2016 01:28:10 +0000 (02:28 +0100)]
avcodec/dxv: Check idx in CHECKPOINT()
Fixes out of array read
Fixes Ticket5098
Fixes Ticket5099
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Ganesh Ajjanagadde [Thu, 31 Dec 2015 04:02:11 +0000 (20:02 -0800)]
lavc/pcm_tablegen: slight speedup of table generation
This gets rid of some branches to speed up table generation slightly
(impact higher on mulaw than alaw). Tables are identical to before,
tested with FATE.
Sample benchmark (Haswell, GNU/Linux+gcc):
old:
313494 decicycles in build_alaw_table, 4094 runs, 2 skips
315959 decicycles in build_alaw_table, 8190 runs, 2 skips
323599 decicycles in build_ulaw_table, 4095 runs, 1 skips
318849 decicycles in build_ulaw_table, 8188 runs, 4 skips
new:
261902 decicycles in build_alaw_table, 4096 runs, 0 skips
266519 decicycles in build_alaw_table, 8192 runs, 0 skips
209657 decicycles in build_ulaw_table, 4096 runs, 0 skips
232656 decicycles in build_ulaw_table, 8192 runs, 0 skips
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Michael Niedermayer [Tue, 5 Jan 2016 00:06:18 +0000 (01:06 +0100)]
avcodec/h264_slice: Fix integer overflow in implicit weight computation
Fixes mozilla bug
1230423
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 4 Jan 2016 22:22:25 +0000 (23:22 +0100)]
swscale/utils: Use normal bilinear scaler if fast cannot be used due to tiny dimensions
Fixes Ticket4960
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 4 Jan 2016 18:59:12 +0000 (19:59 +0100)]
avcodec/h264_refs: Fix and add back trace code removed in
e1c5170c638e39a8017827339ac687c5f6ff9b35
Matthieu Bouron [Sat, 26 Dec 2015 17:17:49 +0000 (18:17 +0100)]
swscale/arm/yuv2rgb: add ff_yuv422p_to_{argb,rgba,abgr,bgra}_neon_{16,32}
Matthieu Bouron [Sat, 26 Dec 2015 17:45:33 +0000 (17:45 +0000)]
swscale/arm/yuv2rgb: fix typo
Paul B Mahol [Mon, 4 Jan 2016 11:50:36 +0000 (12:50 +0100)]
avfilter/avf_showspectrum: add option to set gain for calculating color intensity
Inspired by Sonic Visualizer.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Andreas Cadhalpun [Mon, 4 Jan 2016 12:44:16 +0000 (13:44 +0100)]
brstm: fix missing closing brace
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Mon, 4 Jan 2016 11:53:20 +0000 (12:53 +0100)]
brstm: also allocate b->table in read_packet
This fixes NULL pointer dereferencing if the codec is forced to
adpcm_thp even though a different one was detected.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Mon, 4 Jan 2016 11:57:38 +0000 (12:57 +0100)]
brstm: make sure an ADPC chunk was read for adpcm_thp
This fixes NULL pointer dereferencing.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Sun, 3 Jan 2016 18:11:24 +0000 (19:11 +0100)]
vorbisdec: reject rangebits 0 with non-0 partitions
This causes non-unique elements in floor_setup->data.t1.list, which
makes the stream undecodable according to the specification.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Hendrik Leppkes [Mon, 4 Jan 2016 10:40:34 +0000 (11:40 +0100)]
Merge commit '
2080bea4a74b6b1598caa806a11ea807ba546f94 '
* commit '
2080bea4a74b6b1598caa806a11ea807ba546f94 ':
h264_refs: Remove broken trace debug code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 4 Jan 2016 10:32:11 +0000 (11:32 +0100)]
Merge commit '
58170b027144f4840018c7a60fb8d07924cc6242 '
* commit '
58170b027144f4840018c7a60fb8d07924cc6242 ':
lavc: Add missing #includes for ff_dlog()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 4 Jan 2016 10:31:43 +0000 (11:31 +0100)]
Merge commit '
3b6473b43eb69fc3faaf69f7fd0b83b51db7607f '
* commit '
3b6473b43eb69fc3faaf69f7fd0b83b51db7607f ':
qsvdec: properly handle the warning from MFXVideoCORE_SyncOperation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 4 Jan 2016 10:31:33 +0000 (11:31 +0100)]
Merge commit '
a43905f4ae261bdde87c300901d867b31961f57b '
* commit '
a43905f4ae261bdde87c300901d867b31961f57b ':
qsvenc_hevc: improve the default settings
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Mon, 4 Jan 2016 10:30:58 +0000 (11:30 +0100)]
Merge commit '
9d74012761bc3ee676fe43321d5699e4877fde5b '
* commit '
9d74012761bc3ee676fe43321d5699e4877fde5b ':
h264: improve behaviour with invalid reference lists
Not merged, as we have a different solution.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Mats Peterson [Sat, 2 Jan 2016 05:30:22 +0000 (06:30 +0100)]
lavf/qtpalette: Ignore greyscale bit in certain cases
The QuickTime File Format Specification states the following:
"Depth: A 16-bit integer that indicates the pixel depth of the
compressed image. Values of 1, 2, 4, 8 ,16, 24, and 32 indicate the
depth of color images. The value 32 should be used only if the image
contains an alpha channel. Values of 34, 36, and 40 indicate 2-, 4-, and
8-bit grayscale, respectively, for grayscale images."
There is no mention of value 33, i.e. 1-bit video (0x01) with the
greyscale bit (0x20) set. I therefore suggest that we ignore the
greyscale bit when processing 1-bit video. Another reason to do this is
that the first 1-bit sample file below will be displayed properly with
blue colors in QuickTime in Windows or Mac *in spite of* the greyscale
bit being set.
Also, QuickTime in Windows or Mac ignores the greyscale bit if the
video sample description contains a palette, regardless of bit depth.
This is undocumented behaviour, but I think we should do the same, and
it seems pretty logical after all, since one wouldn't really bother
putting a customized palette into a grayscale file anyway. See the
second 8-bit sample file below, which has the greyscale bit set, and
which contains a palette in the video sample description. In Windows or
Mac, it will be displayed with the palette in the sample description, in
spite of the greyscale bit being set.
Sample file 1 (1-bit QuickTime Animation):
https://drive.google.com/open?id=0B3_pEBoLs0faTThSek1EeXQ0ZHM
Earth Spin 1-bit qtrle orig.mov
Sample file 2 (8-bit QuickTime Animation):
https://drive.google.com/open?id=0B3_pEBoLs0fad2s0V1YzUWo5aDA
quiz-palette+gs.mov
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Mats Peterson [Tue, 29 Dec 2015 21:50:56 +0000 (22:50 +0100)]
lavc/qtrle: Use AV_PIX_FMT_PAL8 for 1-bit video
This commit fixes the lack of palettized display of 1-bit video
in the qtrle decoder. It is related to my commit of
lavf/qtpalette, which added 1-bit video to the "palettized video"
category. As far as I can see, everything works fine, but comments are
of course welcome.
Below are links to sample files, which should now be displayed properly
with bluish colors, but which were previously displayed in black &
white.
Matroska:
https://drive.google.com/open?id=0B3_pEBoLs0faNjI0cHBMWDhYY2c
Earth Spin 1-bit qtrle.mkv
QuickTime (mov):
https://drive.google.com/open?id=0B3_pEBoLs0faUlItWm9KaGJSTEE
Earth Spin 1-bit qtrle.mov
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 3 Jan 2016 17:48:45 +0000 (18:48 +0100)]
avcodec/h264: Fix regression caused by removial of default_ref_list
This fixes a regression of the sample from Ticket 2371
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Andreas Cadhalpun [Sun, 3 Jan 2016 18:20:54 +0000 (19:20 +0100)]
vorbisdec: reject channel mapping with less than two channels
It causes the angle channel number to equal the magnitude channel
number, which makes the stream undecodable according to the
specification.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Paul B Mahol [Sun, 3 Jan 2016 21:43:21 +0000 (22:43 +0100)]
avfilter/avf_showspectrum: finally fix log scaler
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 3 Jan 2016 21:03:10 +0000 (22:03 +0100)]
avfilter/avf_showspectrum: switch to FFT
Rationale: supports >16 bit audio, more than 96dB SNR.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Carl Eugen Hoyos [Sun, 3 Jan 2016 21:55:31 +0000 (22:55 +0100)]
lavfi/drawtext: Fix microsecond display.
Fixes ticket #4792.
Diego Biurrun [Fri, 11 Dec 2015 12:32:47 +0000 (13:32 +0100)]
h264_refs: Remove broken trace debug code
Diego Biurrun [Fri, 11 Dec 2015 12:17:15 +0000 (13:17 +0100)]
lavc: Add missing #includes for ff_dlog()
Andreas Cadhalpun [Sat, 2 Jan 2016 15:27:02 +0000 (16:27 +0100)]
ffmdec: reset packet_end in case of failure
This fixes segmentation faults caused by passing a packet_ptr of NULL to
memcpy.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Sun, 3 Jan 2016 00:19:23 +0000 (01:19 +0100)]
lavc: use get_bitsz to simplify the code
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Sat, 2 Jan 2016 23:28:42 +0000 (00:28 +0100)]
get_bits: add get_bitsz for reading 0-25 bits
This can be used to simplify code in a couple of places.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Michael Niedermayer [Sun, 3 Jan 2016 14:47:23 +0000 (15:47 +0100)]
avformat/ffmdec: Add {} to nested if/else
This preempts potential bugs if this is changed and the indention
ends up different from C interpretation
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Nicolas George [Sat, 24 Oct 2015 17:43:55 +0000 (19:43 +0200)]
lavfi/vf_decimate: do not compare the first frame to itself.
This is a waste of computing power and will result to 0,
making it always dropped.
Use maximum difference values instead.
James Almer [Sun, 3 Jan 2016 05:09:02 +0000 (02:09 -0300)]
x86/vf_stereo3d: remove a few unnecessary movas
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 2 Jan 2016 19:28:31 +0000 (16:28 -0300)]
configure: bump copyright year to 2016
Signed-off-by: James Almer <jamrial@gmail.com>
Andreas Cadhalpun [Sat, 2 Jan 2016 15:27:43 +0000 (16:27 +0100)]
ffmdec: change type of state and id to unsigned
This fixes ubsan runtime error: left shift by 8 places cannot be
represented in type 'int'
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Michael Niedermayer [Fri, 1 Jan 2016 01:41:06 +0000 (02:41 +0100)]
avcodec/put_bits: Always check buffer end before writing
This causes a overall slowdown of 0.1 % (tested with mpeg4 single thread encoding of matrixbench at QP=3)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 1 Jan 2016 23:12:34 +0000 (00:12 +0100)]
doc/encoders: Fix application name
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Hendrik Leppkes [Sat, 2 Jan 2016 18:07:08 +0000 (19:07 +0100)]
avutil/cpu: add missing entry for vfp_vm to av_parse_cpu_caps
Hendrik Leppkes [Sat, 2 Jan 2016 18:06:40 +0000 (19:06 +0100)]
avcodec/dca: remove unused float quant table
Hendrik Leppkes [Sat, 2 Jan 2016 14:05:41 +0000 (15:05 +0100)]
dca: adjust decoding of the XBR extension for integer core decoding
Paul B Mahol [Sat, 2 Jan 2016 17:10:03 +0000 (18:10 +0100)]
avfilter/avf_showspectrum: add 4th and 5th root scaler
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 2 Jan 2016 14:25:58 +0000 (15:25 +0100)]
avfilter/avf_showspectrum: make some helper functions
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 2 Jan 2016 10:49:15 +0000 (11:49 +0100)]
avfilter/avf_showspectrum: fix null pointer dereference if allocation fails
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 1 Jan 2016 22:22:00 +0000 (23:22 +0100)]
avfilter/avf_showspectrum: add fiery color map
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 31 Dec 2015 19:45:37 +0000 (20:45 +0100)]
avfilter: add showspectrumpic filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 31 Dec 2015 19:31:32 +0000 (20:31 +0100)]
avfilter/avf_showspectrum: store win_size in private context and calculate it only once
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 2 Jan 2016 17:51:11 +0000 (18:51 +0100)]
avfilter/vf_zoompan: do not free frame we pushed to lavfi
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 16:52:34 +0000 (17:52 +0100)]
Merge commit '
40d949677335a564f769823f4afdb7e7a3da8d6b '
* commit '
40d949677335a564f769823f4afdb7e7a3da8d6b ':
dca: use defines for subband related constants
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 12:27:11 +0000 (13:27 +0100)]
Merge commit '
8563f9887194b07c972c3475d6b51592d77f73f7 '
* commit '
8563f9887194b07c972c3475d6b51592d77f73f7 ':
x86: use emms after ff_int32_to_float_fmul_scalar_sse
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 12:26:28 +0000 (13:26 +0100)]
Merge commit '
f0f54117c8f206e8045d301c2eb975b26e9f263d '
* commit '
f0f54117c8f206e8045d301c2eb975b26e9f263d ':
checkasm: x86: post commit review fixes
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 12:23:25 +0000 (13:23 +0100)]
Merge commit '
f4f27e4cf1013c55b2c7df359ce8d58ee922662c '
* commit '
f4f27e4cf1013c55b2c7df359ce8d58ee922662c ':
x86: zero extend the 32-bit length in int32_to_float_fmul_scalar implicitly
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 12:20:13 +0000 (13:20 +0100)]
Merge commit '
69a68593ce5684409c3c4dd9a901bfd8b16925b1 '
* commit '
69a68593ce5684409c3c4dd9a901bfd8b16925b1 ':
Remove stray line breaks from avpriv_{report_missing_feature|request_samples}
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 12:19:23 +0000 (13:19 +0100)]
Merge commit '
5049f6b772891cdf4030a9d572362efc8f7ae97f '
* commit '
5049f6b772891cdf4030a9d572362efc8f7ae97f ':
rtpdec_jpeg: Coalesce redundant error checks
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 12:17:48 +0000 (13:17 +0100)]
Merge commit '
2008f76054906e9ff6bf744800af0e5a5bfe61be '
* commit '
2008f76054906e9ff6bf744800af0e5a5bfe61be ':
dca: remove unused decode_hf function and quant_d tables
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 12:08:29 +0000 (13:08 +0100)]
Merge commit '
aebf07075f4244caf591a3af71e5872fe314e87b '
* commit '
aebf07075f4244caf591a3af71e5872fe314e87b ':
dca: change the core to work with integer coefficients.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 11:51:26 +0000 (12:51 +0100)]
Merge commit '
85990140e7302d1e7fcc9fc0eea316178c19fe03 '
* commit '
85990140e7302d1e7fcc9fc0eea316178c19fe03 ':
dca: Add math helpers.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 11:50:13 +0000 (12:50 +0100)]
Merge commit '
489e6add4478b0f5717dbf644234c6f3a3baf02c '
* commit '
489e6add4478b0f5717dbf644234c6f3a3baf02c ':
checkasm: add fmtconvert tests
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 11:45:34 +0000 (12:45 +0100)]
Merge commit '
568a4323fbde03665b2b23a98068d02b39121812 '
* commit '
568a4323fbde03665b2b23a98068d02b39121812 ':
checkasm: add synth_filter test
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 11:38:46 +0000 (12:38 +0100)]
Merge commit '
e71b747e9dc56cb84f8a06ec8214d5f3bd98bb6d '
* commit '
e71b747e9dc56cb84f8a06ec8214d5f3bd98bb6d ':
checkasm: add tests for dcadsp
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 11:35:24 +0000 (12:35 +0100)]
Merge commit '
9d218d573f8088c606d873e80df572582e6773ef '
* commit '
9d218d573f8088c606d873e80df572582e6773ef ':
checkasm: add float comparison util functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Andreas Cadhalpun [Sun, 20 Dec 2015 21:20:57 +0000 (22:20 +0100)]
doc: make apidoc output independent of SRC_PATH
Previously it included the SRC_PATH in every title.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Tue, 29 Dec 2015 17:32:01 +0000 (18:32 +0100)]
oggparsedaala: reject too large gpshift
Also use a unsigned constant for the shift calculation, as 1 << 31 is
undefined for int32_t. This is also fixed oggparsetheora.
This fixes ubsan runtime error: shift exponent is too large for
32-bit type 'int'
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 10:55:44 +0000 (11:55 +0100)]
Merge commit '
711781d7a1714ea4eb0217eb1ba04811978c43d1 '
* commit '
711781d7a1714ea4eb0217eb1ba04811978c43d1 ':
x86: checkasm: check for or handle missing cleanup after MMX instructions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 10:22:33 +0000 (11:22 +0100)]
Merge commit '
cc29d96d5a379dbcf2649947d884c202c2a52767 '
* commit '
cc29d96d5a379dbcf2649947d884c202c2a52767 ':
arm64: fix inverted register order in transpose_4x4H
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 10:22:17 +0000 (11:22 +0100)]
Merge commit '
5ea59b1f424f0efc7805d837e6fdb80561fb0f3a '
* commit '
5ea59b1f424f0efc7805d837e6fdb80561fb0f3a ':
exr: fix out of bounds read in get_code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 10:22:05 +0000 (11:22 +0100)]
Merge commit '
17776638c392d104975aba169e17b186490e1d5e '
* commit '
17776638c392d104975aba169e17b186490e1d5e ':
opus: Fix typo causing overflow in silk_stabilize_lsf
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 10:21:36 +0000 (11:21 +0100)]
Merge commit '
90b1b9350c0a97c4065ae9054b83e57f48a0de1f '
* commit '
90b1b9350c0a97c4065ae9054b83e57f48a0de1f ':
arm: add ff_int32_to_float_fmul_array8_neon
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 10:21:16 +0000 (11:21 +0100)]
Merge commit '
a0fc780a2093784e8664f88205ee1b215e109cee '
* commit '
a0fc780a2093784e8664f88205ee1b215e109cee ':
arm64: int32_to_float_fmul neon asm
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 10:14:28 +0000 (11:14 +0100)]
Merge commit '
705f5e5e155f6f280a360af220fc5b30cfcee702 '
* commit '
705f5e5e155f6f280a360af220fc5b30cfcee702 ':
arm64: port synth_filter_float_neon from arm
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 10:10:24 +0000 (11:10 +0100)]
Merge commit '
c33c1fa8af2b2e82418a06901b6ad17b3d61b73e '
* commit '
c33c1fa8af2b2e82418a06901b6ad17b3d61b73e ':
arm64: convert dcadsp neon asm from arm
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 10:01:29 +0000 (11:01 +0100)]
Merge commit '
e2710e790c09e49e86baa58c6063af0097cc8cb0 '
* commit '
e2710e790c09e49e86baa58c6063af0097cc8cb0 ':
arm: add a cpu flag for the VFPv2 vector mode
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 09:46:18 +0000 (10:46 +0100)]
Merge commit '
5dfe4edad63971d669ae456b0bc40ef9364cca80 '
* commit '
5dfe4edad63971d669ae456b0bc40ef9364cca80 ':
x86_64: int32_to_float_fmul_scalar sign extend integer length
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 09:25:55 +0000 (10:25 +0100)]
Merge commit '
64034849dad8410bedbe1def4c533490fb85cc4a '
* commit '
64034849dad8410bedbe1def4c533490fb85cc4a ':
arm64: add cycle counter support
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 09:25:12 +0000 (10:25 +0100)]
Merge commit '
50078c1c8070dd8d1c329e8117ff30ec72489039 '
* commit '
50078c1c8070dd8d1c329e8117ff30ec72489039 ':
libavutil: move FFALIGN macro from common.h to macros.h
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 09:20:46 +0000 (10:20 +0100)]
Merge commit '
dbce017913ce04966021a2f72e4f8fae5b4b7190 '
* commit '
dbce017913ce04966021a2f72e4f8fae5b4b7190 ':
mpegtsenc: add flag to embed an AC-3 ES the DVB way
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 2 Jan 2016 09:13:58 +0000 (10:13 +0100)]
Merge commit '
cc4c24208159200b7aff5b5c313903c7f23fa345 '
* commit '
cc4c24208159200b7aff5b5c313903c7f23fa345 ':
avresample: Mark avresample_buffer() as pointer to const
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 1 Jan 2016 19:23:37 +0000 (20:23 +0100)]
avcodec/utils: fix AVPacket lifetime in seek_frame_generic
Fixes ticket #5117
Michael Niedermayer [Fri, 1 Jan 2016 20:03:33 +0000 (21:03 +0100)]
avformat/mp3dec: Remove unused variable
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Ganesh Ajjanagadde [Tue, 29 Dec 2015 21:16:08 +0000 (13:16 -0800)]
lavfi/af_sofalizer: remove exp2 and replace clz by ff_clz
ff_clz is faster, and uses an intrinsic (at the moment on GCC). exp2 is
a wasteful function for a simple integer exponentiation.
Untested.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Clément Bœsch [Tue, 22 Dec 2015 22:11:41 +0000 (23:11 +0100)]
lavf/srtdec: rewrite parsing logic
Fixes Ticket #5032
The samples in Ticket #5032 is using \r\r\n as line breaks. Since we
already are handling \r, or \n, or \r\n as line breaks, \r\n\n will be
considered as a double line breaks. This is an issue because
ff_subtitles_read_text_chunk() will as a result stop extracting a chunk
after just one line.
So instead of parsing the SRT by "chunks" (which means splitting every
double LB), this new parser is detecting timing lines, and split the
events on this basis. While this sounds safe and simple, it needs to
take into account the event number preceding the timing line while
handling situations such as:
- event number starting at 0 or actually any number instead of 1
- event numbers not being ordered at all
- event number being followed by text garbage (this really happened,
see Ticket #4898)
- event payload containing one or multiple number (a protagonist saying
a count-down, a date or whatever) which could be confused with a
chapter number
- event number being empty (see Ticket #2167)
- all kind of weird line breaks can appear randomly like wild pokémons
- untrustable line breaks (Ticket #5032)
The sample madness.srt tries to sum up most of this into one sample,
ticket5032-rrn.srt is the file containing \r\r\n line breaks. and
empty-events-2167.srt contains empty events.
Hendrik Leppkes [Fri, 1 Jan 2016 16:22:25 +0000 (17:22 +0100)]
Merge commit '
5bc223b15d064e328ff90b0241fa1191f1d2786d '
* commit '
5bc223b15d064e328ff90b0241fa1191f1d2786d ':
r3d: fix an invalid read introduced in
6bf4c1d
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 1 Jan 2016 16:21:32 +0000 (17:21 +0100)]
Merge commit '
64f8c439fd663fec4d57ac21af572d498fe21f7a '
* commit '
64f8c439fd663fec4d57ac21af572d498fe21f7a ':
rtmpproto: Include the full path as app when "slist=" is found
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 1 Jan 2016 16:21:04 +0000 (17:21 +0100)]
Merge commit '
9f0b6e6827e21e3477abe1199dc2728e30b8c061 '
* commit '
9f0b6e6827e21e3477abe1199dc2728e30b8c061 ':
vocdec: do not create the stream in read_header()
Not merged as it breaks FATE.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 1 Jan 2016 16:14:46 +0000 (17:14 +0100)]
Merge commit '
2d0432d918a71468419b7ac1e543ab3b399d3d37 '
* commit '
2d0432d918a71468419b7ac1e543ab3b399d3d37 ':
vocdec: put the code not shared with other demuxers under appropriate ifdef
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 1 Jan 2016 16:13:28 +0000 (17:13 +0100)]
Merge commit '
09ae7b81ea2051eec2be9964296bd6ef492c6622 '
* commit '
09ae7b81ea2051eec2be9964296bd6ef492c6622 ':
flvdec: do not create any streams in read_header()
Not merged. The demuxer issues warnings when a new stream is encountered
and reading the metadata requires that streams already exist.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Michael Niedermayer [Fri, 1 Jan 2016 15:26:24 +0000 (16:26 +0100)]
Revert "Merge commit '
9f1eccb97bf8894cb18b14f642500686505ef186 '"
This unbreaks muxing-encoding
Example:
ffmpeg -i matrixbench_mpeg2.mpg new.avi
-rw-r----- 1 michael michael
226035354 Jan 1 16:27 new.avi
-rw-r----- 1 michael michael
10016802 Jan 1 16:28 ref.avi
Also av_get_audio_frame_duration() itself uses frame_size
This reverts commit
29e6606e9b42aa811be995e2fcdea4806911bc9f , reversing
changes made to
53448461a7720afab0d1f1234af79573fd2e020d .
Hendrik Leppkes [Fri, 1 Jan 2016 16:05:37 +0000 (17:05 +0100)]
Merge commit '
de9e199a039473ebe4b1b87382e3064d0ea2cf02 '
* commit '
de9e199a039473ebe4b1b87382e3064d0ea2cf02 ':
lavc: make avpriv_mpa_decode_header private on next bump
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 1 Jan 2016 15:57:40 +0000 (16:57 +0100)]
Merge commit '
72d658766e6ccf198317dffd6499c5e288847a1c '
* commit '
72d658766e6ccf198317dffd6499c5e288847a1c ':
mp3dec: replace avpriv_mpa_decode_header with avpriv_mpegaudio_decode_header
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 1 Jan 2016 15:48:47 +0000 (16:48 +0100)]
lavc: fix profile declarations for vdpau decoders
Hendrik Leppkes [Fri, 1 Jan 2016 15:47:27 +0000 (16:47 +0100)]
Merge commit '
955aec3c7c7be39b659197e1ec379a09f2b7c41c '
* commit '
955aec3c7c7be39b659197e1ec379a09f2b7c41c ':
mpegaudiodecheader: check the header in avpriv_mpegaudio_decode_header
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 1 Jan 2016 15:29:28 +0000 (16:29 +0100)]
Merge commit '
cea1eef25c3310a68dd327eb74aae14ad3c2ddef '
* commit '
cea1eef25c3310a68dd327eb74aae14ad3c2ddef ':
lavc: get the profile name through the codec descriptor in avcodec_string()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 1 Jan 2016 15:25:01 +0000 (16:25 +0100)]
lavc: add vp9 profiles to AVCodecDescriptor
Hendrik Leppkes [Fri, 1 Jan 2016 15:16:57 +0000 (16:16 +0100)]
Merge commit '
2c6811397bdf13d43ca206e48d6d6da9c2cd47c6 '
* commit '
2c6811397bdf13d43ca206e48d6d6da9c2cd47c6 ':
lavc: add profiles to AVCodecDescriptor
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>