]>
git.sesse.net Git - ffmpeg/log
Nicolas DEROUINEAU [Tue, 30 Jun 2015 13:17:59 +0000 (15:17 +0200)]
avcodec/h264: Greenmetadata SEI parsing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jun 2015 20:51:19 +0000 (22:51 +0200)]
Merge commit '
271ce76d317c5432e151216cf23f12b77ed6cb7e '
* commit '
271ce76d317c5432e151216cf23f12b77ed6cb7e ':
h264: Parse registered data SEI message and AFD value
Conflicts:
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_sei.c
libavcodec/version.h
See:
d6e95669496a89d186f923c34bcaf7d86b7cd59c
See:
22291c372fa703242e8429bed61700ba81258f19
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jun 2015 20:29:34 +0000 (22:29 +0200)]
Merge commit '
0bfab80a0d9fce0180e8aa2a947267f89b725091 '
* commit '
0bfab80a0d9fce0180e8aa2a947267f89b725091 ':
h264_sei: Group error check outside the switch block
Conflicts:
libavcodec/h264_sei.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jun 2015 20:13:50 +0000 (22:13 +0200)]
Merge commit '
0a49a62f998747cfa564d98d36a459fe70d3299b '
* commit '
0a49a62f998747cfa564d98d36a459fe70d3299b ':
h263: Always check both dimensions
Conflicts:
libavcodec/ituh263dec.c
See:
62006b539ddda23594febf0fcb2f21c03de60457
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jun 2015 20:01:22 +0000 (22:01 +0200)]
Merge commit '
6f4cd33efb5a9ec75db1677d5f7846c60337129f '
* commit '
6f4cd33efb5a9ec75db1677d5f7846c60337129f ':
cosmetic: Reformat ff_h263_decode_mba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jun 2015 19:36:16 +0000 (21:36 +0200)]
Merge commit '
e95c7a61852cc5b9ce5445ff034b87553e61958a '
* commit '
e95c7a61852cc5b9ce5445ff034b87553e61958a ':
mov: Preserve the metadata even when bit-exactness is requested
Conflicts:
libavformat/movenc.c
tests/ref/vsynth/vsynth1-mpeg4
tests/ref/vsynth/vsynth2-mpeg4
See:
a17ee4117dcb2922f57da33b8401d11b06e81cba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jun 2015 19:19:16 +0000 (21:19 +0200)]
Merge commit '
303ec065a90498c29d384b4add2ac626bc38d5eb '
* commit '
303ec065a90498c29d384b4add2ac626bc38d5eb ':
aic: Fix slice size computation for widths multiples of 32 macroblocks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jun 2015 18:59:36 +0000 (20:59 +0200)]
Merge commit '
3e3056f2a020dd77efdf379dbd4c06a65b4a499a '
* commit '
3e3056f2a020dd77efdf379dbd4c06a65b4a499a ':
h264: Allow stream and container cropping at the same time
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Sun, 28 Jun 2015 10:13:05 +0000 (12:13 +0200)]
h264: Parse registered data SEI message and AFD value
Partially based on code by Marton Balint and Kieran Kunhya.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Sun, 28 Jun 2015 00:05:04 +0000 (02:05 +0200)]
h264_sei: Group error check outside the switch block
Luca Barbato [Fri, 26 Jun 2015 13:57:16 +0000 (15:57 +0200)]
h263: Always check both dimensions
CC: libav-stable@libav.org
Found-By: ago@gentoo.org
Luca Barbato [Fri, 26 Jun 2015 13:57:15 +0000 (15:57 +0200)]
cosmetic: Reformat ff_h263_decode_mba
Luca Barbato [Mon, 15 Jun 2015 18:40:46 +0000 (20:40 +0200)]
mov: Preserve the metadata even when bit-exactness is requested
Make sure to not write the custom `encoder` string in that case.
Bug-Id: 845
CC: libav-stable@libav.org
Vittorio Giovara [Sun, 28 Jun 2015 08:50:42 +0000 (10:50 +0200)]
aic: Fix slice size computation for widths multiples of 32 macroblocks
CC: libav-stable@libav.org
Vittorio Giovara [Sun, 8 Mar 2015 04:06:32 +0000 (04:06 +0000)]
h264: Allow stream and container cropping at the same time
The container cropping is applied only when difference is within 16
pixels, and the smallest value between the two is chosen.
Bug-Id: 383
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Sat, 27 Jun 2015 21:36:33 +0000 (23:36 +0200)]
fate: Update ac3 test to the new request_channel_layout option
John Högberg [Mon, 29 Jun 2015 12:57:20 +0000 (14:57 +0200)]
mpegts: Add jpeg2000 stream type
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Paul B Mahol [Tue, 30 Jun 2015 02:20:28 +0000 (02:20 +0000)]
avfilter/vf_ssim: fix some cosmetics issues
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Tue, 30 Jun 2015 18:47:13 +0000 (20:47 +0200)]
Merge commit '
3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f '
* commit '
3ad678a85b96fc5fecd60e3d3a31ca5ffc89d67f ':
fate: Update ac3 test to the new request_channel_layout option
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jun 2015 17:37:12 +0000 (19:37 +0200)]
avcodec/h264_slice: Use w/h from the AVFrame instead of mb_w/h
Fixes out of array access
Fixes: asan_heap-oob_4d5bb0_682_cov_3124593265_Fraunhofer__a_driving_force_in_innovation__small.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jun 2015 14:01:15 +0000 (16:01 +0200)]
avfilter/vf_transpose: Fix rounding error
Fixes out of array access
Fixes: asan_heap-oob_7f875d_3482_cov_1818465256_ssudec.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 30 Jun 2015 12:49:07 +0000 (14:49 +0200)]
configure: Mention hap encoding for --enable-libsnappy.
Carl Eugen Hoyos [Tue, 30 Jun 2015 12:42:31 +0000 (14:42 +0200)]
lavc/j2kenc: Make jp2 output compatible with Kakadu.
Fixes ticket #4689.
Carl Eugen Hoyos [Tue, 30 Jun 2015 12:42:14 +0000 (14:42 +0200)]
doc: Add jpeg2000 encoder documentation.
Carl Eugen Hoyos [Tue, 30 Jun 2015 12:34:56 +0000 (14:34 +0200)]
lavc/hapenc: Silence a warning for multithreaded encoding.
Michael Niedermayer [Tue, 30 Jun 2015 11:45:03 +0000 (13:45 +0200)]
avcodec/j2kenc: store libavcodec ident in a comment unless bitexact mode is used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Zern [Tue, 30 Jun 2015 06:03:14 +0000 (23:03 -0700)]
vp9/update_prob: prevent out of bounds table read
the max value of the lookup in expanded form is:
(((1 << 7) - 1) << 1) - 65 + 1 + 64 = 254
add one entry of padding to inv_map_table[] to prevent out of bounds
access with non-conforming / fuzzed bitstreams
Signed-off-by: James Zern <jzern@google.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jun 2015 11:08:26 +0000 (13:08 +0200)]
Merge commit '
42bc768e5240ec01237ad2eb7c69b917158de258 '
* commit '
42bc768e5240ec01237ad2eb7c69b917158de258 ':
mpegts: Add jpeg2000 stream type
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jun 2015 10:59:16 +0000 (12:59 +0200)]
Merge commit '
1b4c468477f3b8d372da8ef4e5405539ad9c1501 '
* commit '
1b4c468477f3b8d372da8ef4e5405539ad9c1501 ':
riff: Validate the wav header size before trying to parse it
Conflicts:
libavformat/riffdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jun 2015 10:24:12 +0000 (12:24 +0200)]
Merge commit '
5bdfc17189e4ea63c6b46b6d5256852fcb409d68 '
* commit '
5bdfc17189e4ea63c6b46b6d5256852fcb409d68 ':
asf: Do not skip data streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jun 2015 09:57:35 +0000 (11:57 +0200)]
Rename asfdec-o.c to asfdec_o.c
Most files use _ instead of - as spacer, so this is more consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 30 Jun 2015 09:45:14 +0000 (11:45 +0200)]
avformat: rename asfdec.c to asfdec_f.c
leaving it as asfdec.c confuses git
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 30 Jun 2015 07:09:58 +0000 (04:09 -0300)]
configure: fix hevc_vdpau_hwaccel dependencies
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Tue, 30 Jun 2015 01:23:30 +0000 (03:23 +0200)]
avcodec/h264_refs: discard mismatching references
Fixes inconsistency and out of array access
Fixes: asan_heap-oob_17301a3_2100_cov_3226131691_ff_add_pixels_clamped_mmx.m2ts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 29 Jun 2015 23:19:30 +0000 (01:19 +0200)]
avcodec/mjpegdec: Fix small picture upscale
Fixes out of array access
Fixes: asan_heap-oob_1dd60fd_267_cov_2954683513_5baad44ca4702949724234e35c5bb341.jpg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 29 Jun 2015 20:32:02 +0000 (22:32 +0200)]
avcodec/pngdec: Check values before updating context in decode_fctl_chunk()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 29 Jun 2015 19:59:41 +0000 (21:59 +0200)]
avcodec/pngdec: Copy IHDR & plte state from last thread
Previously these chunks where parsed again for each frame with threads
but not without leading to a different path and the potential for
inconsistencies
This also removes a related special case from decode_ihdr_chunk()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 29 Jun 2015 19:57:12 +0000 (21:57 +0200)]
avcodec/pngdec: Require a IHDR chunk before fctl
This is required by the APNG spec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 29 Jun 2015 19:08:05 +0000 (21:08 +0200)]
avcodec/pngdec: Only allow one IHDR chunk
Multiple IHDR chunks are forbidden in PNG
Fixes inconsistency and out of array accesses
Fixes: asan_heap-oob_4d5c5a_1738_cov_2638287726_c-m2-8f2b481b7fd9bd745e620b7c01a18df2.png
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 29 Jun 2015 07:38:16 +0000 (07:38 +0000)]
avfilter/avf_showvolume: optionally display channel names
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 29 Jun 2015 15:29:13 +0000 (17:29 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavf/msnwc: Return 0 if the probe function does not detect msnwc-tcp.
lavf/mpegts: Return 0 if the probe function does not detect mpegts.
lavf/img2dec: Improve detection of valid Quickdraw images.
lavf/asfdec: Reduce minimum header size.
Changelog: Add jpeg 2000 improvements before they get forgotten.
lavf/img2dec: Autodetect dds frames.
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Rostislav Pehlivanov [Fri, 26 Jun 2015 20:16:34 +0000 (21:16 +0100)]
aacenc: add support for coding of intensity stereo scalefactor indices
This commit adds support for the coding of intensity stereo scalefactor indices.
It does not do any marking of such bands and as such does no functional changes
to the encoder. It removes any old twoloop specific code for PNS and moves it
into a seperate function which handles setting of scalefactor indices for
PNS and IS bands.
Reviewed-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 23 Jun 2015 16:24:57 +0000 (18:24 +0200)]
avformat/avio: Move avio_delete() avio_move() to avpriv_ namespace
This was suggested in the discussion about these functions
With this change the functions are available internally but are not
part of the public API
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Mon, 29 Jun 2015 14:29:07 +0000 (16:29 +0200)]
lavf/msnwc: Return 0 if the probe function does not detect msnwc-tcp.
Reduces console spamming on debug level.
Carl Eugen Hoyos [Mon, 29 Jun 2015 14:27:36 +0000 (16:27 +0200)]
lavf/mpegts: Return 0 if the probe function does not detect mpegts.
Reduces console spamming on debug level.
Carl Eugen Hoyos [Mon, 29 Jun 2015 14:25:11 +0000 (16:25 +0200)]
lavf/img2dec: Improve detection of valid Quickdraw images.
Detect Quickdraw images without application header with
lower score.
Carl Eugen Hoyos [Mon, 29 Jun 2015 14:23:15 +0000 (16:23 +0200)]
lavf/asfdec: Reduce minimum header size.
Fixes GipsyGuitar.wmv mentioned in ticket #1477.
Carl Eugen Hoyos [Mon, 29 Jun 2015 14:17:05 +0000 (16:17 +0200)]
Changelog: Add jpeg 2000 improvements before they get forgotten.
Carl Eugen Hoyos [Mon, 29 Jun 2015 14:13:26 +0000 (16:13 +0200)]
lavf/img2dec: Autodetect dds frames.
Michael Niedermayer [Mon, 29 Jun 2015 11:51:43 +0000 (13:51 +0200)]
swscale/swscale_unscaled: Fix rounding difference with RGBA output between little and big endian
Fixes fate/dds-rgb16 on big endian
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Shivraj Patil [Sun, 14 Jun 2015 17:56:26 +0000 (23:26 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for pixblock functions
This patch adds MSA (MIPS-SIMD-Arch) optimizations for pixblock functions in new file pixblockdsp_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 28 Jun 2015 21:23:14 +0000 (21:23 +0000)]
doc/filters: fix documentation bug in ssim filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 29 Jun 2015 02:57:51 +0000 (04:57 +0200)]
avformat/asfdec: Allow packet_obj_size == 0
Fixes Ticket3521
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 29 Jun 2015 02:55:06 +0000 (04:55 +0200)]
avformat/asfdec: Print packet_obj_size in case it is invalid
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ludmila Glinskih [Sat, 27 Jun 2015 22:50:25 +0000 (01:50 +0300)]
api-h264-test: build with another api test
Location of api-h264-test changed to special directory for api tests.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
George Boyle [Sun, 28 Jun 2015 22:47:19 +0000 (23:47 +0100)]
fate/api-tests: Added dependency on $(FF_DEP_LIBS)
This ensures they are built before the tests are run.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
George Boyle [Sun, 28 Jun 2015 01:50:24 +0000 (02:50 +0100)]
tests/Makefile: Fix missing trailing slash for API tests dir target
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Jun 2015 21:09:53 +0000 (23:09 +0200)]
avformat/asfdec: Print a warning if data is skiped due to less than a frame header being left
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Jun 2015 21:07:34 +0000 (23:07 +0200)]
avformat/asfdec: Reduce FRAME_HEADER_SIZE to 11
This fixes demuxing of screen_codec.wmv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rostislav Pehlivanov [Fri, 26 Jun 2015 20:16:33 +0000 (21:16 +0100)]
aaccoder: add intensity stereo support to encode_window_bands_info quantizer
This commit adds support for both PNS and IS (intensity stereo) codebooks to the
encode_window_bands_info() quantizer, used by the faast, faac and anmr non-default,
native coders. This does not mean that both extensions now work with those coders,
some are simply unsuited and will trigger an assertion in the encoder while
others simply ignore the changed scalefactor indices and band types.
This commit simply adds support for encoding said band types with the alternative
coders. Future commits to the coders will be required to make them suitable.
Reviewed-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rostislav Pehlivanov [Fri, 26 Jun 2015 20:16:32 +0000 (21:16 +0100)]
aaccoder: add intensity stereo coding support for the trellis quantizer
This commit extends the trellis quantizer (used by the default twoloop coder)
to accept and correctly encode codebooks needed for intensity stereo and perceptual noise substitution.
Reviewed-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Jun 2015 17:18:16 +0000 (19:18 +0200)]
avcodec/jpeg2000dec: Remove unused variables
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 28 Jun 2015 15:32:40 +0000 (17:32 +0200)]
riff: Validate the wav header size before trying to parse it
Luca Barbato [Sun, 28 Jun 2015 15:03:02 +0000 (17:03 +0200)]
asf: Do not skip data streams
Andreas Cadhalpun [Sun, 28 Jun 2015 10:40:12 +0000 (12:40 +0200)]
wmavoice: limit wmavoice_decode_packet return value to packet size
Claiming to have decoded more bytes than the packet size is wrong.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Rodger Combs [Wed, 24 Jun 2015 12:58:15 +0000 (07:58 -0500)]
lavc/adpcm: THP: set approx_nb_samples correctly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 20 Feb 2015 10:28:36 +0000 (10:28 +0000)]
avfilter: add showvolume filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 28 Jun 2015 12:43:44 +0000 (14:43 +0200)]
avcodec/jpeg2000dec: Merge i_stepsize/2 decoder special case into dequant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Sun, 28 Jun 2015 09:21:54 +0000 (11:21 +0200)]
huffyuvdec: validate image size
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Rostislav Pehlivanov [Fri, 26 Jun 2015 20:16:35 +0000 (21:16 +0100)]
aacpsy: Add energy spread for each band
This commit adds the energy spread to the struct for each band and removes 2 unused fields.
distortion and perceptual_weight were not referenced in any file nor were they set to any value,
so it was safe to remove them. The energy spread is currently only used in the aac psy model.
It's defined as being proportional to the tonality of each band.
Reviewed-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Jun 2015 11:41:40 +0000 (13:41 +0200)]
Merge commit '
8a26ae5f94e613dbf7eb8e3c60462e966e409cdc '
* commit '
8a26ae5f94e613dbf7eb8e3c60462e966e409cdc ':
mpjpeg: Check stream allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Jun 2015 11:05:45 +0000 (13:05 +0200)]
Merge commit '
b08569a23948db107e5e6175cd4c695427d5339d '
* commit '
b08569a23948db107e5e6175cd4c695427d5339d ':
lavf: Replace the ASF demuxer
Conflicts:
Changelog
libavformat/asf.h
libavformat/asfdec.c
libavformat/version.h
tests/ref/fate/wmv8-drm-nodec
tests/ref/seek/lavf-asf
The rewritten demuxer is placed in a new file, the current demuxer is
left as default. Carl has tested both and the one working better is
default.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Jun 2015 10:56:22 +0000 (12:56 +0200)]
avformat/riffdec: Forward error code from avio_read() in ff_get_guid()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Jun 2015 09:58:57 +0000 (11:58 +0200)]
tests/fate/wma: use the existing reference files for wmapro tests
Theres no need to upload or use new files just because they are
shorter.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Jun 2015 09:48:31 +0000 (11:48 +0200)]
Merge commit '
441e8ae5efd681055e5af6f4317fb60110de9dd0 '
* commit '
441e8ae5efd681055e5af6f4317fb60110de9dd0 ':
FATE: drop the last truncated frame from the wmapro tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Jun 2015 09:41:23 +0000 (11:41 +0200)]
Merge commit '
d3ea79e8a65ddad4da11813bb43c46701295f68c '
* commit '
d3ea79e8a65ddad4da11813bb43c46701295f68c ':
FATE: drop the last truncated frame from the wma lossless test
Conflicts:
tests/fate/lossless-audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Sat, 27 Jun 2015 18:16:12 +0000 (20:16 +0200)]
wavpack: use get_bits_long to read up to 32 bits
get_bits should not be used for more than 25 bits.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Luca Barbato [Sat, 27 Jun 2015 21:19:36 +0000 (23:19 +0200)]
mpjpeg: Check stream allocation
Bug-Id: CID
1308152
Alexandra Hájková [Mon, 15 Jun 2015 12:54:45 +0000 (14:54 +0200)]
lavf: Replace the ASF demuxer
The old one is the result of the reverse engineering and guesswork.
The new one has been written following the now-available specification.
This work is part of Outreach Program for Women Summer 2014 activities
for the Libav project.
The fate references had to be changed because the old demuxer truncates
the last frame in some cases, the new one handles it properly.
The seek-test reference is changed because seeking works differently
in the new demuxer. When seeking, the packet is not read from the stream
directly, but it is rather constructed by the demuxer. That is why
position is -1 now in the reference.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sat, 27 Jun 2015 09:46:35 +0000 (11:46 +0200)]
FATE: drop the last truncated frame from the wmapro tests
Since it's truncated, the result depends on how specifically the demuxer
and the decoder handle errors.
Anton Khirnov [Sat, 27 Jun 2015 09:46:35 +0000 (11:46 +0200)]
FATE: drop the last truncated frame from the wma lossless test
Since it's truncated, the result depends on how specifically the demuxer
and the decoder handle errors.
Michael Niedermayer [Sun, 28 Jun 2015 01:16:06 +0000 (03:16 +0200)]
avcodec/jpeg2000: Support 32 decomposition levels
Fixes Ticket4680
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Jun 2015 00:41:48 +0000 (02:41 +0200)]
configure: Also create tests/api
This should fix some problems on some fate clients like openbsd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Jun 2015 00:31:26 +0000 (02:31 +0200)]
avcodec/jpeg2000: support >32bit in ff_jpeg2000_ceildivpow2()
Fixes part of Ticket4680
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 28 Jun 2015 00:27:43 +0000 (02:27 +0200)]
avcodec/jpeg2000: Avoid one shift in ff_jpeg2000_ceildivpow2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ludmila Glinskih [Sat, 27 Jun 2015 14:31:08 +0000 (17:31 +0300)]
api-flac-test: Fix the bug of comparing zero bytes
Add check for linesize.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rostislav Pehlivanov [Fri, 26 Jun 2015 20:16:30 +0000 (21:16 +0100)]
aac: add additional fields needed by the encoder for intensity stereo
This commit adds additional fields which are used by the native encoder to add intensity stereo support. It also adds some clarifying statements to the comments for the codebooks.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 27 Jun 2015 21:56:41 +0000 (23:56 +0200)]
avcodec/h264_slice: Reformat IN_RANGE() uses to be readable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 27 Jun 2015 21:56:06 +0000 (23:56 +0200)]
avcodec/h264_slice: Silence pointer type warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 27 Jun 2015 21:41:00 +0000 (23:41 +0200)]
avcodec/h264_slice: assert that the first slice implies unfinished setup
If this assert fails there is very likely a bug in the code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 27 Jun 2015 19:44:08 +0000 (21:44 +0200)]
Merge commit '
5ec0bdf2c524224f30ba4786f47324970aed4aaa '
* commit '
5ec0bdf2c524224f30ba4786f47324970aed4aaa ':
h264: do not update the context fields copied between threads after finish_setup()
Conflicts:
libavcodec/h264.h
libavcodec/h264_slice.c
See:
f111831ed61103f9fa8fdda41473a23da016bdaa and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 27 Jun 2015 18:41:21 +0000 (20:41 +0200)]
Merge commit '
6d4d3fee63c46d921c4870feab79269af94e84e1 '
* commit '
6d4d3fee63c46d921c4870feab79269af94e84e1 ':
h264: make sure the current picture is not made a long ref multiple times
See:
34ea5f418ef815c629b6ab38a6a2711fd7463290
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 27 Jun 2015 18:34:42 +0000 (20:34 +0200)]
Merge commit '
9a5e4fbec870c7d466b7a0aec92c70778efc96b5 '
* commit '
9a5e4fbec870c7d466b7a0aec92c70778efc96b5 ':
avconv: do not stop processing the input packet on decoding error
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 27 Jun 2015 17:21:25 +0000 (19:21 +0200)]
Merge commit '
b114f6d48a06a4dad6882bc83e07463905f004c4 '
* commit '
b114f6d48a06a4dad6882bc83e07463905f004c4 ':
avconv: factor out flushing the filters
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 27 Jun 2015 16:45:39 +0000 (13:45 -0300)]
avutil/x86/intmath: add missing check for inline assembly
Signed-off-by: James Almer <jamrial@gmail.com>
Andreas Cadhalpun [Sat, 27 Jun 2015 15:50:56 +0000 (17:50 +0200)]
nutdec: check maxpos in read_sm_data before returning success
Otherwise sm_size can be larger than size, which results in a negative
packet size.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Michael Niedermayer [Sat, 27 Jun 2015 16:38:17 +0000 (18:38 +0200)]
Merge commit '
e49e0f58e273237f83b4486f3536931ed1943d18 '
* commit '
e49e0f58e273237f83b4486f3536931ed1943d18 ':
h264: make sure the slices do not overlap during slice threading
Conflicts:
libavcodec/h264.h
libavcodec/h264_slice.c
See:
43b434210e597d484aef57c4139c3126d22b7e2b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Niklesh [Fri, 26 Jun 2015 20:14:44 +0000 (01:44 +0530)]
movtextenc.c: Support for Bold, Italic and Underlined Styles
Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
Michael Niedermayer [Sat, 27 Jun 2015 16:13:26 +0000 (18:13 +0200)]
Merge commit '
b56b12cd12f32bf11efff05632600a7619584b98 '
* commit '
b56b12cd12f32bf11efff05632600a7619584b98 ':
configure: Check for x265_api_get
Conflicts:
configure
See:
f4be604f1c4d5cb6480c81c671d646cc16b02017
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 27 Jun 2015 15:50:09 +0000 (12:50 -0300)]
avutil/x86/intmath: use bzhi gcc builtin in av_mod_uintp2()
Signed-off-by: James Almer <jamrial@gmail.com>