]> git.sesse.net Git - ffmpeg/log
ffmpeg
10 years agovp9/x86: make STORE_2X2 macro local.
Ronald S. Bultje [Wed, 8 Jan 2014 12:22:50 +0000 (07:22 -0500)]
vp9/x86: make STORE_2X2 macro local.

Prevents this assembler warning:
libavcodec/x86/vp9itxfm.asm:1208: warning: (VP9_IDCT32_1D:309)
redefining multi-line macro `STORE_2X2'

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/huffyuvenc: Factorize store_huffman_tables() out
Michael Niedermayer [Wed, 8 Jan 2014 13:00:14 +0000 (14:00 +0100)]
avcodec/huffyuvenc: Factorize store_huffman_tables() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/ffv1enc: choose 1.2 by default for higher resolutions to ensure multi-threade...
Michael Niedermayer [Sun, 8 Dec 2013 15:39:35 +0000 (16:39 +0100)]
avcodec/ffv1enc: choose 1.2 by default for higher resolutions to ensure multi-threaded decodability

Reviewed-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'rbultje/vp9-simd'
Michael Niedermayer [Wed, 8 Jan 2014 12:02:38 +0000 (13:02 +0100)]
Merge remote-tracking branch 'rbultje/vp9-simd'

* rbultje/vp9-simd:
  vp9: make mv bounds 32bit.
  vp9: reset contextual caches on frame size change with mt enabled.
  vp9/x86: idct_32x32_add_ssse3 sub-8x8-idct.
  vp9/x86: idct_32x32_add_ssse3 sub-16x16-idct.
  vp9/x86: idct_32x32_add_ssse3.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavisynth: Use av_packet_from_data instead of av_new_packet
Stephen Hutchinson [Wed, 8 Jan 2014 05:37:57 +0000 (00:37 -0500)]
avisynth: Use av_packet_from_data instead of av_new_packet

If the audio changes from 9eac7c4 were merged as they were, this
would cause scripts with both video+audio to fail with a lot of
audio decoding errors (the video would be fine). Scripts with
only one of either video or audio were unaffected. Additionally,
the av_packet changes in general caused seeking to break.

Using av_packet_from_data allows video+audio scripts to work as
expected, without audio decoding errors.  It also fixes seeking.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavisynth: More av_new_packet changes
Anton Khirnov [Wed, 8 Jan 2014 05:37:56 +0000 (00:37 -0500)]
avisynth: More av_new_packet changes

These are the remaining av_packet-related bits from 9eac7c4
that didn't get merged at that time.

Changes authored by Anton Khirnov <anton@khirnov.net>, split out
from 9eac7c4 by Stephen Hutchinson <qyot27@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/huffyuvenc: fix -context 1 encoding
Michael Niedermayer [Wed, 8 Jan 2014 11:38:57 +0000 (12:38 +0100)]
avcodec/huffyuvenc: fix -context 1 encoding

Fixes Ticket3281

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agodoc/muxers/image2: apply several formatting changes
Stefano Sabatini [Wed, 8 Jan 2014 09:13:15 +0000 (10:13 +0100)]
doc/muxers/image2: apply several formatting changes

10 years agodoc/muxers/image2: document strftime option
Ramiro Polla [Wed, 8 Jan 2014 04:49:42 +0000 (02:49 -0200)]
doc/muxers/image2: document strftime option

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
10 years agodoc/muxers/matroska: add information to the matroska metadata language entry
Helmut K. C. Tessarek [Wed, 8 Jan 2014 08:50:57 +0000 (09:50 +0100)]
doc/muxers/matroska: add information to the matroska metadata language entry

10 years agodoc/ffmpeg: remove documentation for removed vlang/slang options
Stefano Sabatini [Wed, 8 Jan 2014 08:47:53 +0000 (09:47 +0100)]
doc/ffmpeg: remove documentation for removed vlang/slang options

10 years agodoc/muxers/matroska: reformat documentation
Stefano Sabatini [Wed, 8 Jan 2014 08:45:04 +0000 (09:45 +0100)]
doc/muxers/matroska: reformat documentation

10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 8 Jan 2014 04:44:51 +0000 (05:44 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Add a missing # as prefix for an immediate constant

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '5dae4872357613a0b51120b54a4c5221e0ec3f69'
Michael Niedermayer [Wed, 8 Jan 2014 04:36:48 +0000 (05:36 +0100)]
Merge commit '5dae4872357613a0b51120b54a4c5221e0ec3f69'

* commit '5dae4872357613a0b51120b54a4c5221e0ec3f69':
  arm: Allow overriding the alignment set in the function macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0'
Michael Niedermayer [Wed, 8 Jan 2014 04:21:10 +0000 (05:21 +0100)]
Merge commit 'b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0'

* commit 'b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0':
  arm: Remove a leftover define for the pld instruction

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f'
Michael Niedermayer [Wed, 8 Jan 2014 04:13:25 +0000 (05:13 +0100)]
Merge commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f'

* commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f':
  arm: cosmetics: Reindent the h264dsp neon init function

Conflicts:
libavcodec/arm/h264dsp_init_arm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/mxfdec: detect loops during header parsing
Michael Niedermayer [Wed, 8 Jan 2014 03:49:50 +0000 (04:49 +0100)]
avformat/mxfdec: detect loops during header parsing

The header parser uses forward and backward parsing, making the
bulletproof prevention of loops difficult, thus this simple
detection code.
If someone improves the forward/backward parsing so it cannot loop
then this commit should be reverted

Fixes Ticket3278

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agovp9: make mv bounds 32bit.
Ronald S. Bultje [Tue, 7 Jan 2014 12:24:03 +0000 (07:24 -0500)]
vp9: make mv bounds 32bit.

Fixes an assert in file from trac ticket 3188.

10 years agovp9: reset contextual caches on frame size change with mt enabled.
Ronald S. Bultje [Tue, 7 Jan 2014 12:24:31 +0000 (07:24 -0500)]
vp9: reset contextual caches on frame size change with mt enabled.

Fixes crash/valgrind errors in trac ticket 3188 and hang in 3274.

10 years agovp9/x86: idct_32x32_add_ssse3 sub-8x8-idct.
Ronald S. Bultje [Sun, 5 Jan 2014 16:18:47 +0000 (11:18 -0500)]
vp9/x86: idct_32x32_add_ssse3 sub-8x8-idct.

Runtime of the full 32x32 idct goes from 2446 to 2441 cycles (intra) or
from 1425 to 1306 cycles (inter). Overall runtime is not significantly
affected.

10 years agovp9/x86: idct_32x32_add_ssse3 sub-16x16-idct.
Ronald S. Bultje [Sat, 4 Jan 2014 15:29:45 +0000 (10:29 -0500)]
vp9/x86: idct_32x32_add_ssse3 sub-16x16-idct.

Runtime of all IDCTs together goes from 3327 to 2473 cycles (intra, i.e.
~35% faster) or from 2312 to 1448 cycles (inter, i.e. ~60% faster). Total
decode time of ped1080p.webm goes from 8.086sec to 7.974sec (1.4% faster).

10 years agovp9/x86: idct_32x32_add_ssse3.
Ronald S. Bultje [Sat, 4 Jan 2014 15:08:47 +0000 (10:08 -0500)]
vp9/x86: idct_32x32_add_ssse3.

Sub-IDCTs will follow later. ped1080.webm goes from 9.295s to 8.191s
(13.5% faster). The IDCT itself goes from 4372 (intra) or 4337 (inter)
to 403 (intra) or 329 (inter) cycles for the DC-only form, 23755 (intra)
or 23723 (inter) to 3497 (intra) or 3607 (inter) cycles for the no-DC
form, which averages from 23393 (intra) or 16612 (inter) to 3449 (intra)
or 2392 (inter) for all 32x32s together, i.e. about ~7x faster (all
tests done on ped1080p.webm).

10 years agoUse the h264 parser when decoding VSSH in avi.
Carl Eugen Hoyos [Tue, 7 Jan 2014 21:49:05 +0000 (22:49 +0100)]
Use the h264 parser when decoding VSSH in avi.

Fixes ticket #3261 visually.

Analyzed-by: Michael Doilnitsyn
10 years agodoc/filters/equalizer: add examples for equalizer
Werner Robitza [Thu, 2 Jan 2014 19:17:56 +0000 (20:17 +0100)]
doc/filters/equalizer: add examples for equalizer

Add two examples on the usage of the equalizer filter.

10 years agotools/qt-faststart: add -movflags +faststart note
Lou Logan [Tue, 7 Jan 2014 19:59:04 +0000 (10:59 -0900)]
tools/qt-faststart: add -movflags +faststart note

10 years agoavformat/takdec: zero padding area before use
Michael Niedermayer [Tue, 7 Jan 2014 18:47:37 +0000 (19:47 +0100)]
avformat/takdec: zero padding area before use

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fcecee73d71_6470_luckynight-partial.tak
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoarm: Add a missing # as prefix for an immediate constant
Martin Storsjö [Tue, 7 Jan 2014 12:01:24 +0000 (14:01 +0200)]
arm: Add a missing # as prefix for an immediate constant

Signed-off-by: Martin Storsjö <martin@martin.st>
10 years agoarm: Allow overriding the alignment set in the function macro
Martin Storsjö [Tue, 7 Jan 2014 10:13:11 +0000 (12:13 +0200)]
arm: Allow overriding the alignment set in the function macro

The function macro always sets .align 2 before declaring the
function label (since 5c5e1ea3) and always sets the section to
.text (since 278caa6a).

The .align 5 before certain functions, added in fc252eba, were added
before .text and .align were added to the function macro and thus
became useless/unused when the function macro got them.

This restores the original intention, to align the loop entry
points.

Signed-off-by: Martin Storsjö <martin@martin.st>
10 years agoarm: Remove a leftover define for the pld instruction
Martin Storsjö [Tue, 7 Jan 2014 10:05:56 +0000 (12:05 +0200)]
arm: Remove a leftover define for the pld instruction

This file no longer uses the pld instruction at all, all such uses
have been split into hpeldsp_arm.S.

Signed-off-by: Martin Storsjö <martin@martin.st>
10 years agoarm: cosmetics: Reindent the h264dsp neon init function
Martin Storsjö [Tue, 7 Jan 2014 09:15:49 +0000 (11:15 +0200)]
arm: cosmetics: Reindent the h264dsp neon init function

Signed-off-by: Martin Storsjö <martin@martin.st>
10 years agoavformat/adxdec: dont return random data on EOF
Michael Niedermayer [Tue, 7 Jan 2014 15:05:56 +0000 (16:05 +0100)]
avformat/adxdec: dont return random data on EOF

Fixes use of uninitialized memory
Partly fixes; msan_uninit-mem_7fb7d24780d0_2744_R03T.CAK
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/segafilm: drop song and dance, this seems not to do anything anymore since...
Michael Niedermayer [Tue, 7 Jan 2014 13:38:49 +0000 (14:38 +0100)]
avformat/segafilm: drop song and dance, this seems not to do anything anymore since a long time

Fixes use of uninitialized memory
Partly fixes; msan_uninit-mem_7fb7d24780d0_2744_R03T.CAK
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/flacdec: check rice_order against blocksize
Michael Niedermayer [Tue, 7 Jan 2014 12:57:47 +0000 (13:57 +0100)]
avcodec/flacdec: check rice_order against blocksize

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f6e13c220d0_8489_short.flac
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 7 Jan 2014 12:16:47 +0000 (13:16 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  network.h: Add #endif comments to improve readability

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agorename CONFIG_FFT_FIXED_32 -> FFT_FIXED_32
Michael Niedermayer [Tue, 7 Jan 2014 12:05:33 +0000 (13:05 +0100)]
rename CONFIG_FFT_FIXED_32 -> FFT_FIXED_32

This matches FFT_FLOAT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '794fcf79a89eca2d4e889803b2c804a0b1defbb3'
Michael Niedermayer [Tue, 7 Jan 2014 12:04:09 +0000 (13:04 +0100)]
Merge commit '794fcf79a89eca2d4e889803b2c804a0b1defbb3'

* commit '794fcf79a89eca2d4e889803b2c804a0b1defbb3':
  Rename CONFIG_FFT_FLOAT ---> FFT_FLOAT

Conflicts:
libavcodec/fft-internal.h
libavcodec/fft-test.c
libavcodec/fft_fixed.c
libavcodec/fft_float.c
libavcodec/fft_template.c
libavcodec/mdct_fixed.c
libavcodec/mdct_float.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoexamples/decoding_encoding: fix style nits
Stefano Sabatini [Tue, 7 Jan 2014 11:47:28 +0000 (12:47 +0100)]
examples/decoding_encoding: fix style nits

10 years agoavformat/webvttdec: Dont skip over a never checked byte after -->
Michael Niedermayer [Tue, 7 Jan 2014 03:08:18 +0000 (04:08 +0100)]
avformat/webvttdec: Dont skip over a never checked byte after -->

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f49667d83db_3396_WebVTT_capability_tester.vtt
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/mpeg4videodec: use av_fast_padded_malloc() for bitstream buffer
Michael Niedermayer [Tue, 7 Jan 2014 00:27:23 +0000 (01:27 +0100)]
avcodec/mpeg4videodec: use av_fast_padded_malloc() for bitstream buffer

Fixes use of uninitialized memory with vlc (sample from ticket3277)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 6 Jan 2014 23:38:19 +0000 (00:38 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libopusenc: Change default frame duration to 20 ms

See: 74906d3727ec3bd9b7b28dfa7a98ff6e8cf8b6d7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/rmdec: check that sub_packet_size fit in the packet for DEINT_ID_GENR
Michael Niedermayer [Mon, 6 Jan 2014 21:58:24 +0000 (22:58 +0100)]
avformat/rmdec: check that sub_packet_size fit in the packet for DEINT_ID_GENR

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fa8c49400d0_3923_audiosig.rm
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavformat/nutdec: check avio_read() return code
Michael Niedermayer [Mon, 6 Jan 2014 21:58:24 +0000 (22:58 +0100)]
avformat/nutdec: check avio_read() return code

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f2785ab8669_6838_mewmew_vorbis_ssa.nut
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '9409c9bdbfd829353473ee6cc3e91c726481c069'
Michael Niedermayer [Mon, 6 Jan 2014 21:24:47 +0000 (22:24 +0100)]
Merge commit '9409c9bdbfd829353473ee6cc3e91c726481c069'

* commit '9409c9bdbfd829353473ee6cc3e91c726481c069':
  configure: Disable networking if winsock2.h is available but winsock functions aren't

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '01d245ef4392152dbdc78a6ba4dfa0a6e8b08e6f'
Michael Niedermayer [Mon, 6 Jan 2014 21:09:14 +0000 (22:09 +0100)]
Merge commit '01d245ef4392152dbdc78a6ba4dfa0a6e8b08e6f'

* commit '01d245ef4392152dbdc78a6ba4dfa0a6e8b08e6f':
  random_seed: Rewrite the generic clock() based seed code

Conflicts:
libavutil/random_seed.c

See: 66531c75d3bfd8a013acd8bd3c04a131dae2a1a0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/huffyuv: add YUVA420P, YUVA422P, YUVA444P, GBRAP, GRAY8A
Michael Niedermayer [Mon, 6 Jan 2014 18:47:34 +0000 (19:47 +0100)]
avcodec/huffyuv: add YUVA420P, YUVA422P, YUVA444P, GBRAP, GRAY8A

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agonetwork.h: Add #endif comments to improve readability
Diego Biurrun [Mon, 6 Jan 2014 10:26:20 +0000 (11:26 +0100)]
network.h: Add #endif comments to improve readability

10 years agoavcodec/huffyuv: add GRAY8 support
Michael Niedermayer [Mon, 6 Jan 2014 18:47:34 +0000 (19:47 +0100)]
avcodec/huffyuv: add GRAY8 support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/huffyuv: add GBRP support
Michael Niedermayer [Mon, 6 Jan 2014 18:47:34 +0000 (19:47 +0100)]
avcodec/huffyuv: add GBRP support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoRename CONFIG_FFT_FLOAT ---> FFT_FLOAT
Diego Biurrun [Mon, 6 Jan 2014 13:48:18 +0000 (14:48 +0100)]
Rename CONFIG_FFT_FLOAT ---> FFT_FLOAT

The define does not originate from configure, so it should not
have a name that is CONFIG_-prefixed.

10 years agolibopusenc: Change default frame duration to 20 ms
Paul B Mahol [Fri, 15 Nov 2013 01:09:06 +0000 (01:09 +0000)]
libopusenc: Change default frame duration to 20 ms

20 ms is the default in the libopus encoder, and gives better
quality than 10 ms.

Signed-off-by: Martin Storsjö <martin@martin.st>
10 years agoconfigure: Disable networking if winsock2.h is available but winsock functions aren't
Martin Storsjö [Tue, 31 Dec 2013 08:11:24 +0000 (10:11 +0200)]
configure: Disable networking if winsock2.h is available but winsock functions aren't

Previously, if neither of the checks for the closesocket function
succeeded, we still kept winsock2.h and networking in general
enabled.

When targeting the WinRT API subset, the winsock2.h header is
available (making the check for it succeed, giving the impression
that winsock is available), but tests that actually try to use
such a function will fail. In this case, disable the winsock2.h
feature and networking in general, as if the winsock2.h header
test would have failed in the first place.

Signed-off-by: Martin Storsjö <martin@martin.st>
10 years agorandom_seed: Rewrite the generic clock() based seed code
Michael Niedermayer [Mon, 11 Jun 2012 09:47:59 +0000 (11:47 +0200)]
random_seed: Rewrite the generic clock() based seed code

The new code is faster and reuses the previous state in case of
multiple calls.

The previous code could easily end up in near-infinite loops,
if the difference between two clock() calls never was larger than
1.

This makes fate-parseutils finish in finite time when run in wine,
if CryptGenRandom isn't available (which e.g. isn't available if
targeting Windows RT/metro).

Patch originally by Michael Niedermayer but with some modifications
by Martin Storsjö.

Signed-off-by: Martin Storsjö <martin@martin.st>
10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 6 Jan 2014 16:41:54 +0000 (17:41 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Update freetype check to follow upstream

Conflicts:
configure

Not merged, as its broken (Reported by ubitux)

See: cea5812fa723c08b89d929eeba73462e05de2973
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'd68dc3c9446e38b4d686cc0f55433c9e8d7c128b'
Michael Niedermayer [Mon, 6 Jan 2014 16:25:52 +0000 (17:25 +0100)]
Merge commit 'd68dc3c9446e38b4d686cc0f55433c9e8d7c128b'

* commit 'd68dc3c9446e38b4d686cc0f55433c9e8d7c128b':
  drawtext: Drop pointless header

See: cea5812fa723c08b89d929eeba73462e05de2973
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '6892d145a0c80249bd61ee7dd31ec851c5076bcd'
Michael Niedermayer [Mon, 6 Jan 2014 16:12:15 +0000 (17:12 +0100)]
Merge commit '6892d145a0c80249bd61ee7dd31ec851c5076bcd'

* commit '6892d145a0c80249bd61ee7dd31ec851c5076bcd':
  segafilm: fix leaks if reading the header fails

Conflicts:
libavformat/segafilm.c

See: ca5456db7fa62a81d8effa20fb7547c16dd1d796
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '9cbf2d78f0a9c19129e7a70b2281a450d386c6d9'
Michael Niedermayer [Mon, 6 Jan 2014 16:00:01 +0000 (17:00 +0100)]
Merge commit '9cbf2d78f0a9c19129e7a70b2281a450d386c6d9'

* commit '9cbf2d78f0a9c19129e7a70b2281a450d386c6d9':
  pthread_frame: unref decoded frames on failure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'a03a642d5ceb5f2f7c6ebbf56ff365dfbcdb65eb'
Michael Niedermayer [Mon, 6 Jan 2014 15:45:52 +0000 (16:45 +0100)]
Merge commit 'a03a642d5ceb5f2f7c6ebbf56ff365dfbcdb65eb'

* commit 'a03a642d5ceb5f2f7c6ebbf56ff365dfbcdb65eb':
  h264: do not use 422 functions for monochrome

See: 07abf13da4a7c3d23ce6bc6542d72e6252161736
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '9eef9eb3014b2ed9c3ff4aac510a9f04edb555cf'
Michael Niedermayer [Mon, 6 Jan 2014 15:39:38 +0000 (16:39 +0100)]
Merge commit '9eef9eb3014b2ed9c3ff4aac510a9f04edb555cf'

* commit '9eef9eb3014b2ed9c3ff4aac510a9f04edb555cf':
  h264: check that execute_decode_slices() is not called too many times

Conflicts:
libavcodec/h264.c

The check is replaced by an assert() as the mb index should not ever go out
of bounds.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'bfd26b7ce6efea594f2b99441d900419df3af638'
Michael Niedermayer [Mon, 6 Jan 2014 15:28:55 +0000 (16:28 +0100)]
Merge commit 'bfd26b7ce6efea594f2b99441d900419df3af638'

* commit 'bfd26b7ce6efea594f2b99441d900419df3af638':
  h264: reject mismatching luma/chroma bit depths during sps parsing

Conflicts:
libavcodec/h264_ps.c

See: bdeb61ccc67911cfc5e20c7cfb1312d0501ca90a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/h264: reset list_count too in case of error in ff_set_ref_count()
Michael Niedermayer [Mon, 6 Jan 2014 15:15:40 +0000 (16:15 +0100)]
avcodec/h264: reset list_count too in case of error in ff_set_ref_count()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '9a026c72982faf20e1c8dfbe48f0b312cdea69c8'
Michael Niedermayer [Mon, 6 Jan 2014 15:15:03 +0000 (16:15 +0100)]
Merge commit '9a026c72982faf20e1c8dfbe48f0b312cdea69c8'

* commit '9a026c72982faf20e1c8dfbe48f0b312cdea69c8':
  h264: rebuild the default ref list if the reference count changes

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '4736d003fac30af4afd8390182f12f480ad78801'
Michael Niedermayer [Mon, 6 Jan 2014 14:51:17 +0000 (15:51 +0100)]
Merge commit '4736d003fac30af4afd8390182f12f480ad78801'

* commit '4736d003fac30af4afd8390182f12f480ad78801':
  cavsdec: check ff_get_buffer() return value

Conflicts:
libavcodec/cavsdec.c

See: eee8c94f50bfcd93c1f761b4e6b55bec3815616d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '50079a6aa93291e6dc9d9fb8d33da83f79e9311d'
Michael Niedermayer [Mon, 6 Jan 2014 14:43:24 +0000 (15:43 +0100)]
Merge commit '50079a6aa93291e6dc9d9fb8d33da83f79e9311d'

* commit '50079a6aa93291e6dc9d9fb8d33da83f79e9311d':
  lavc: do not leak the internal frame if opening the codec fails

Conflicts:
libavcodec/utils.c

See: 8b285f03f70e884312c6c4e00a1377cfd85a3a7a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f'
Michael Niedermayer [Mon, 6 Jan 2014 14:34:45 +0000 (15:34 +0100)]
Merge commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f'

* commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f':
  lavf: remove a pointless check

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '75647dea6f7db79b409bad66a119f5c73da730f3'
Michael Niedermayer [Mon, 6 Jan 2014 14:24:42 +0000 (15:24 +0100)]
Merge commit '75647dea6f7db79b409bad66a119f5c73da730f3'

* commit '75647dea6f7db79b409bad66a119f5c73da730f3':
  oggparseogm: check timing variables

See: 9ed388f5985992a0a6a43fdc0b1732962b6b5619
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '8058284ce09030b47512746d726fb2ad3ae8a20f'
Michael Niedermayer [Mon, 6 Jan 2014 14:17:34 +0000 (15:17 +0100)]
Merge commit '8058284ce09030b47512746d726fb2ad3ae8a20f'

* commit '8058284ce09030b47512746d726fb2ad3ae8a20f':
  lavc: add 422/444 YUV with alpha to align_dimensions()

Conflicts:
libavcodec/utils.c

Only cosmetical changes happen as these formats already where in the list before

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '2f97094608cfd2665660f7a26a3291559b186752'
Michael Niedermayer [Mon, 6 Jan 2014 13:57:41 +0000 (14:57 +0100)]
Merge commit '2f97094608cfd2665660f7a26a3291559b186752'

* commit '2f97094608cfd2665660f7a26a3291559b186752':
  lagarith: do not call simd functions on unaligned lines

Conflicts:
libavcodec/lagarith.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'f4a8a0080537484154bb74e08ec76cbcbd25484b'
Michael Niedermayer [Mon, 6 Jan 2014 13:40:26 +0000 (14:40 +0100)]
Merge commit 'f4a8a0080537484154bb74e08ec76cbcbd25484b'

* commit 'f4a8a0080537484154bb74e08ec76cbcbd25484b':
  sgidec: fix buffer size check in expand_rle_row()

Conflicts:
libavcodec/sgidec.c

See: 39c56ef9216c508a2c19cef93600e6590b4595cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f'
Michael Niedermayer [Mon, 6 Jan 2014 12:57:29 +0000 (13:57 +0100)]
Merge commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f'

* commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f':
  kgv1dec: replace forcing EMU_EDGE by a copy

Conflicts:
libavcodec/kgv1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'fe80fa53bc4977ef6e8e749a9df8ca5590a09307'
Michael Niedermayer [Mon, 6 Jan 2014 12:48:46 +0000 (13:48 +0100)]
Merge commit 'fe80fa53bc4977ef6e8e749a9df8ca5590a09307'

* commit 'fe80fa53bc4977ef6e8e749a9df8ca5590a09307':
  4xm: replace forcing EMU_EDGE by a copy

Conflicts:
libavcodec/4xm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit 'fffca3d278c2a2422c2f61f21c5a9d5f690d328e'
Michael Niedermayer [Mon, 6 Jan 2014 12:30:40 +0000 (13:30 +0100)]
Merge commit 'fffca3d278c2a2422c2f61f21c5a9d5f690d328e'

* commit 'fffca3d278c2a2422c2f61f21c5a9d5f690d328e':
  4xm: return a proper error code.

Conflicts:
libavcodec/4xm.c

See: a5e382ad7ffd8be810f3a614c4c447a1cd1936f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '060667195e6e6bc0fa63ce13c47e23aabe70d122'
Michael Niedermayer [Mon, 6 Jan 2014 12:24:37 +0000 (13:24 +0100)]
Merge commit '060667195e6e6bc0fa63ce13c47e23aabe70d122'

* commit '060667195e6e6bc0fa63ce13c47e23aabe70d122':
  hevc: rename some HEVC conformance streams

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '98c0cd0b99254cd12f312bf6a4c24cd3ec5886b5'
Michael Niedermayer [Mon, 6 Jan 2014 12:01:02 +0000 (13:01 +0100)]
Merge commit '98c0cd0b99254cd12f312bf6a4c24cd3ec5886b5'

* commit '98c0cd0b99254cd12f312bf6a4c24cd3ec5886b5':
  hevc: add new conformance streams

Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoconfigure: Update freetype check to follow upstream
Luca Barbato [Sat, 21 Dec 2013 16:59:59 +0000 (17:59 +0100)]
configure: Update freetype check to follow upstream

The freetype tutorial suggests to use #include FT_FREETYPE_H.

Bug-Id: 616

10 years agodrawtext: Drop pointless header
Luca Barbato [Sun, 5 Jan 2014 11:30:45 +0000 (12:30 +0100)]
drawtext: Drop pointless header

It should be forward compatible with newer freetype.

10 years agosegafilm: fix leaks if reading the header fails
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
segafilm: fix leaks if reading the header fails

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

10 years agopthread_frame: unref decoded frames on failure
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
pthread_frame: unref decoded frames on failure

This is similar to what the non-threaded code already does.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

10 years agoh264: do not use 422 functions for monochrome
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: do not use 422 functions for monochrome

Fixes invalid memory access.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

10 years agoh264: check that execute_decode_slices() is not called too many times
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: check that execute_decode_slices() is not called too many times

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

10 years agoh264: reject mismatching luma/chroma bit depths during sps parsing
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: reject mismatching luma/chroma bit depths during sps parsing

There is no point in delaying the check and it avoids bugs with a
half-initialized context.

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

10 years agoh264: rebuild the default ref list if the reference count changes
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: rebuild the default ref list if the reference count changes

Fixes possible access to freed memory.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

10 years agocavsdec: check ff_get_buffer() return value
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
cavsdec: check ff_get_buffer() return value

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

10 years agolavc: do not leak the internal frame if opening the codec fails
Anton Khirnov [Mon, 16 Dec 2013 21:54:43 +0000 (22:54 +0100)]
lavc: do not leak the internal frame if opening the codec fails

10 years agolavf: remove a pointless check
Anton Khirnov [Mon, 16 Dec 2013 21:37:40 +0000 (22:37 +0100)]
lavf: remove a pointless check

AVStream.codec is always non-NULL

10 years agooggparseogm: check timing variables
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
oggparseogm: check timing variables

Fixes a potential divide by zero.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

10 years agolavc: add 422/444 YUV with alpha to align_dimensions()
Anton Khirnov [Fri, 3 Jan 2014 13:50:49 +0000 (14:50 +0100)]
lavc: add 422/444 YUV with alpha to align_dimensions()

Aligns frame dimensions to 16, which fixes potential invalid writes.

10 years agolagarith: do not call simd functions on unaligned lines
Kostya Shishkov [Mon, 30 Dec 2013 08:31:57 +0000 (09:31 +0100)]
lagarith: do not call simd functions on unaligned lines

They end up overwriting past the line end.

Partially based on a patch by Michael Niedermayer <michaelni@gmx.at>

Bug-Id: vlc/9700
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
10 years agosgidec: fix buffer size check in expand_rle_row()
Anton Khirnov [Thu, 2 Jan 2014 08:34:20 +0000 (09:34 +0100)]
sgidec: fix buffer size check in expand_rle_row()

Right now it will spuriously fail if the linesize is exactly equal to
the data width.

CC:libav-stable@libav.org

10 years agokgv1dec: replace forcing EMU_EDGE by a copy
Anton Khirnov [Tue, 17 Dec 2013 07:56:13 +0000 (08:56 +0100)]
kgv1dec: replace forcing EMU_EDGE by a copy

The decoder currently sets CODEC_FLAG_EMU_EDGE and relies on
get_buffer2() to always provide buffers with linesize == 2 * width.
This is wrong, since we place no such restriction on get_buffer2()
implementations.

Fix this by decoding into internal buffers and copying them to output
frames. Since this is a very obscure decoder, the performance hit should
not be an issue.

10 years ago4xm: replace forcing EMU_EDGE by a copy
Anton Khirnov [Tue, 17 Dec 2013 07:56:13 +0000 (08:56 +0100)]
4xm: replace forcing EMU_EDGE by a copy

The decoder currently sets CODEC_FLAG_EMU_EDGE and relies on
get_buffer2() to always provide buffers with linesize == 2 * width.
This is wrong, since we place no such restriction on get_buffer2()
implementations.

Fix this by decoding into internal buffers and copying them to output
frames. Since this is a very obscure decoder, the performance hit should
not be an issue.

10 years ago4xm: return a proper error code.
Anton Khirnov [Tue, 17 Dec 2013 07:33:55 +0000 (08:33 +0100)]
4xm: return a proper error code.

10 years agohevc: rename some HEVC conformance streams
Guillaume Martres [Tue, 31 Dec 2013 13:29:04 +0000 (14:29 +0100)]
hevc: rename some HEVC conformance streams

Some HEVC conformance streams zip on
http://wftp3.itu.int/av-arch/jctvc-site/bitstream_exchange/draft_conformance/
were updated without changing the actual stream. Rename them in FATE
accordingly to make it easier to track future stream updates.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
10 years agohevc: add new conformance streams
Guillaume Martres [Tue, 31 Dec 2013 13:29:03 +0000 (14:29 +0100)]
hevc: add new conformance streams

Also remove superseded conformance streams. The conformance streams all
come from http://wftp3.itu.int/av-arch/jctvc-site/bitstream_exchange/draft_conformance/

Signed-off-by: Anton Khirnov <anton@khirnov.net>
10 years agoavcodec/hevc: Fix modulo operations
Michael Niedermayer [Mon, 6 Jan 2014 01:51:20 +0000 (02:51 +0100)]
avcodec/hevc: Fix modulo operations

Fixes qp fields becoming out of range
Fixes: asan_static-oob_e393a3_6998_WPP_A_ericsson_MAIN10_2.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/hevc_ps: check that VPS referenced from SPS exists
Michael Niedermayer [Mon, 6 Jan 2014 01:51:20 +0000 (02:51 +0100)]
avcodec/hevc_ps: check that VPS referenced from SPS exists

This matches how its done for SPS/PPS.
An alternative to this is to check it when its used.

Fixes null pointer dereference
Fixes: signal_sigsegv_e30a43_1437_CIP_A_Panasonic_3.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/huffyuvdec: optimize decode_plane_bitstream(), use joint tables for new yuv...
Michael Niedermayer [Wed, 1 Jan 2014 00:47:10 +0000 (01:47 +0100)]
avcodec/huffyuvdec: optimize decode_plane_bitstream(), use joint tables for new yuv formats

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agofate: test version 3 of ffvhuff
Michael Niedermayer [Mon, 6 Jan 2014 00:37:22 +0000 (01:37 +0100)]
fate: test version 3 of ffvhuff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoavcodec/huffyuv: Support more 8bit YUV formats
Michael Niedermayer [Wed, 1 Jan 2014 00:42:59 +0000 (01:42 +0100)]
avcodec/huffyuv: Support more 8bit YUV formats

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 5 Jan 2014 22:23:53 +0000 (23:23 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cmdutils: update copyright year to 2014.

Conflicts:
cmdutils.c

See: 0b1cfc4f28d81a8a49fdd5589b2eed06477abd61
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years agoMerge commit '7840c40445c9f52aeccba96de3d27613398bfbf2'
Michael Niedermayer [Sun, 5 Jan 2014 22:14:20 +0000 (23:14 +0100)]
Merge commit '7840c40445c9f52aeccba96de3d27613398bfbf2'

* commit '7840c40445c9f52aeccba96de3d27613398bfbf2':
  (e)ac3dec: set AV_FRAME_DATA_MATRIXENCODING side data.

Merged-by: Michael Niedermayer <michaelni@gmx.at>