chromium/third_party/ffmpeg.git
3 days agoUpdate clang warning flags. 02/72202/2 master
Nico Weber [Wed, 19 Nov 2014 21:59:21 +0000 (13:59 -0800)]
Update clang warning flags.

Change-Id: Id04ae23b8321daa6eaa40026cf6774ecf51ead43

4 days agoMerge "Update config files for MIPS Linux"
Dale Curtis [Tue, 18 Nov 2014 18:56:30 +0000 (10:56 -0800)]
Merge "Update config files for MIPS Linux"

4 days agoUpdate config files for MIPS Linux 92/72192/1
Petar Jovanovic [Tue, 18 Nov 2014 18:53:19 +0000 (19:53 +0100)]
Update config files for MIPS Linux

Recent update to FFmpeg config broke the build of Chromium for MIPS.
This change is a result of two commands:

$ ./chromium/scripts/build_ffmpeg.py linux mipsel
$ ./chromium/scripts/copy_config.sh

BUG= regression build issue
TEST= build Chromium for MIPS Linux

5 days agoInclude yasm files for ia32/x64 only 83/72183/2
Petar Jovanovic [Mon, 17 Nov 2014 15:50:50 +0000 (16:50 +0100)]
Include yasm files for ia32/x64 only

This will prevent including yasm files for MIPS and it should fix GN build
for Chromium for MIPS-Linux.

8 days agoMerge branch 'merge-m40'
Xiaohan Wang [Fri, 14 Nov 2014 23:53:08 +0000 (15:53 -0800)]
Merge branch 'merge-m40'

8 days agoUpdate FFmpeg configs for M40. 46/72146/3 merge-m40
Xiaohan Wang [Thu, 13 Nov 2014 01:25:18 +0000 (17:25 -0800)]
Update FFmpeg configs for M40.

Notes:

1, HAVE_ATOMIC_COMPARE_EXCHANGE is turned on on some platforms.
This is checked at compile time and when it's 1, we'll end up building those
atomic_ function. But if the actual target doesn't support it, the compiler
will spit out some warnings and end up generating a call to an external
function. We'll keep these as is and watch whether they are failing any bots.

2, cast5 is only used tools/crypto_bench.c. We'll investigate how to disable
these tools later. See http://crbug.com/433066

3, CONFIG_LIBXCB is used by x11grab_xcb. This is automatically enabled, but not
built into Chromium's ffmpegsumo.so.

BUG=426560
TEST=Smoke tested on Linux.

Change-Id: Iafd4a4ef21dd5ef01d1293cedc9bb653084e0926

10 days agoFix Windows OS detection in build_ffmpeg.py. 42/72142/2
Xiaohan Wang [Wed, 12 Nov 2014 23:17:53 +0000 (15:17 -0800)]
Fix Windows OS detection in build_ffmpeg.py.

BUG=chromium:426560

Change-Id: I0b79c534619b54268310dc46d72767684257298c

12 days agoFix color space comparison in libavcodec/utils.c.
Xiaohan Wang [Tue, 11 Nov 2014 01:41:29 +0000 (17:41 -0800)]
Fix color space comparison in libavcodec/utils.c.

The upstream code is comparing two different enum types, causing build
warning/error with clang on Linux.

BUG=426560

2 weeks agoMerge "avcodec/vorbisdec: Fix off by 1 error in ptns_to_read"
Xiaohan Wang [Fri, 7 Nov 2014 00:10:48 +0000 (16:10 -0800)]
Merge "avcodec/vorbisdec: Fix off by 1 error in ptns_to_read"

2 weeks agoMerge "Fix read-after-free in matroska_read_seek()."
Xiaohan Wang [Fri, 7 Nov 2014 00:10:21 +0000 (16:10 -0800)]
Merge "Fix read-after-free in matroska_read_seek()."

2 weeks agoavcodec/vorbisdec: Fix off by 1 error in ptns_to_read 03/72103/2
Michael Niedermayer [Sat, 4 Oct 2014 01:12:34 +0000 (03:12 +0200)]
avcodec/vorbisdec: Fix off by 1 error in ptns_to_read

Fixes read of uninitialized memory
Fixes: asan_heap-uaf_18dac2b_9_asan_heap-uaf_22eb375_208_beta3_test_small.ogg

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
BUG=419060
Change-Id: Iaf948243bf8767201f73e0c7140eaa65d8833911

2 weeks agoFix read-after-free in matroska_read_seek(). 02/72102/1
Xiaohan Wang [Thu, 6 Nov 2014 20:59:54 +0000 (12:59 -0800)]
Fix read-after-free in matroska_read_seek().

In matroska_read_seek(), |tracks| is assigned at the begining of the function.
However, functions like matroska_parse_cues() could reallocate the tracks so
that |tracks| can get invalidated.

This CL assigns |tracks| only before we use it so that it won't be invalidated.

BUG=427266
TEST=Test case in associated bug passes now.

Change-Id: I9c7065fe8f4311ca846076281df2282d190ed344

2 weeks agoMerge ffmpeg for M40.
Xiaohan Wang [Fri, 31 Oct 2014 19:16:53 +0000 (12:16 -0700)]
Merge ffmpeg for M40.

Taken from commit f05855414ed4cce97c06ba2a31f4987af47e6d4e

Conflicts:
compat/w32pthreads.h
libavcodec/vdpau_internal.h
libavformat/mp3dec.c

3 weeks agolavc/utils: Make pix_fmt desc pointer const.
Carl Eugen Hoyos [Wed, 29 Oct 2014 23:27:04 +0000 (00:27 +0100)]
lavc/utils: Make pix_fmt desc pointer const.

Fixes an "initialization discards qualifiers from pointer target type" warning.

3 weeks agoAutodetect libxcb.
Carl Eugen Hoyos [Wed, 29 Oct 2014 23:26:27 +0000 (00:26 +0100)]
Autodetect libxcb.

3 weeks agomxfenc: fix indentation after last commit
Thomas Mundt [Wed, 29 Oct 2014 20:26:25 +0000 (20:26 +0000)]
mxfenc: fix indentation after last commit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoMerge commit '84bf64d3598c98a748e609195358ea04b0cfd140'
Michael Niedermayer [Wed, 29 Oct 2014 21:21:49 +0000 (22:21 +0100)]
Merge commit '84bf64d3598c98a748e609195358ea04b0cfd140'

* commit '84bf64d3598c98a748e609195358ea04b0cfd140':
  bethsoftvid: simplify return handling

See: 5ee6527c4386c76a0aae1b07842d6676ee1e91d1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoMerge commit 'e9ba3098319f78c91470c05da988d865491852c5'
Michael Niedermayer [Wed, 29 Oct 2014 21:09:06 +0000 (22:09 +0100)]
Merge commit 'e9ba3098319f78c91470c05da988d865491852c5'

* commit 'e9ba3098319f78c91470c05da988d865491852c5':
  assdec: check av_new_packet return value

Conflicts:
libavformat/assdec.c

See: 7c9f9685ae2d45d5bbb939483a01266622e8f14c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoMerge commit '2cd28693a59050717cb7da6cb229e606b1dee356'
Michael Niedermayer [Wed, 29 Oct 2014 20:58:32 +0000 (21:58 +0100)]
Merge commit '2cd28693a59050717cb7da6cb229e606b1dee356'

* commit '2cd28693a59050717cb7da6cb229e606b1dee356':
  jack: Use av_strerror

Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavdevice/fbdev_dec: use errno instead of ret for av_log
Michael Niedermayer [Wed, 29 Oct 2014 20:44:19 +0000 (21:44 +0100)]
avdevice/fbdev_dec: use errno instead of ret for av_log

Should fix printing the wrong value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoMerge commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e'
Michael Niedermayer [Wed, 29 Oct 2014 20:41:59 +0000 (21:41 +0100)]
Merge commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e'

* commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e':
  fbdev: Use av_strerror

Conflicts:
libavdevice/fbdev_dec.c

See: f6b56b1f26a1e40a47d85d24b42cd5475cd3b04f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoMerge commit 'f64d7e919eabd427f3e6dd4a1219e448c78deb42'
Michael Niedermayer [Wed, 29 Oct 2014 20:25:51 +0000 (21:25 +0100)]
Merge commit 'f64d7e919eabd427f3e6dd4a1219e448c78deb42'

* commit 'f64d7e919eabd427f3e6dd4a1219e448c78deb42':
  mtv: improve header check and avoid division by zero

Conflicts:
libavformat/mtv.c

See: 8b9b6332dfeb169098c8ab1351d66fc5b474dd55
Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoMerge commit 'b3d11437ca55d81eeb10c923343ad69b73895fa8'
Michael Niedermayer [Wed, 29 Oct 2014 19:49:25 +0000 (20:49 +0100)]
Merge commit 'b3d11437ca55d81eeb10c923343ad69b73895fa8'

* commit 'b3d11437ca55d81eeb10c923343ad69b73895fa8':
  oggenc: remove unneeded null check

See: a147c1b2b125c26cd2c5105a7f274a597de37731
Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoMerge commit 'a9179b5bd6f143b4a7ff48bb0d00c8f0a7cafb4b'
Michael Niedermayer [Wed, 29 Oct 2014 19:43:33 +0000 (20:43 +0100)]
Merge commit 'a9179b5bd6f143b4a7ff48bb0d00c8f0a7cafb4b'

* commit 'a9179b5bd6f143b4a7ff48bb0d00c8f0a7cafb4b':
  configure: Check only for xcb

Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavformat/utils: support more AVC Intra formats without SPS/PPS header
Thomas Mundt [Wed, 29 Oct 2014 13:04:48 +0000 (13:04 +0000)]
avformat/utils: support more AVC Intra formats without SPS/PPS header

add support for AVC Intra 50 720p and 1080p without SPS/PPS header in mxf and mov demuxers. I got the SPS/PPS tables from libbmx.

Reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoMerge "Update README.chromium with additional details."
John Rummell [Wed, 29 Oct 2014 18:28:33 +0000 (11:28 -0700)]
Merge "Update README.chromium with additional details."

3 weeks agoavformat/mpjpeg: make boundary tag user customizable
Michael Niedermayer [Wed, 29 Oct 2014 16:57:18 +0000 (17:57 +0100)]
avformat/mpjpeg: make boundary tag user customizable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavformat/subtitles: reduce log level of UTF-16 warning
wm4 [Wed, 29 Oct 2014 17:29:43 +0000 (18:29 +0100)]
avformat/subtitles: reduce log level of UTF-16 warning

Applications can use this to silence the message.

3 weeks agolavu/atomic: add support for the new memory model aware gcc built-ins
James Almer [Tue, 28 Oct 2014 01:48:08 +0000 (22:48 -0300)]
lavu/atomic: add support for the new memory model aware gcc built-ins

__sync built-ins are considered legacy and will be deprecated.
These new memory model aware built-ins have been available since GCC 4.7.0

Use them by default when available except for __atomic_compare_exchange_n(),
which is slower, and is instead implemented as a fallback for when and if gcc
removes the legacy __sync built-ins.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
3 weeks agobethsoftvid: simplify return handling
Vittorio Giovara [Wed, 29 Oct 2014 17:02:27 +0000 (17:02 +0000)]
bethsoftvid: simplify return handling

Fixes a double free in case of av_packet_new_side_data() failure.

3 weeks agoassdec: check av_new_packet return value
Vittorio Giovara [Fri, 24 Oct 2014 12:15:40 +0000 (13:15 +0100)]
assdec: check av_new_packet return value

CC: libav-stable@libav.org
Bug-Id: CID 703626

3 weeks agojack: Use av_strerror
Luca Barbato [Sun, 26 Oct 2014 13:02:45 +0000 (14:02 +0100)]
jack: Use av_strerror

3 weeks agofbdev: Use av_strerror
Luca Barbato [Sun, 26 Oct 2014 13:02:44 +0000 (14:02 +0100)]
fbdev: Use av_strerror

3 weeks agomtv: improve header check and avoid division by zero
Vittorio Giovara [Fri, 24 Oct 2014 12:15:36 +0000 (13:15 +0100)]
mtv: improve header check and avoid division by zero

CC: libav-stable@libav.org
Bug-Id: CID 732203 / CID 732204

3 weeks agooggenc: remove unneeded null check
Michael Niedermayer [Fri, 24 Oct 2014 12:15:37 +0000 (13:15 +0100)]
oggenc: remove unneeded null check

The code would have segfaulted before if oggstream were NULL.

CC: libav-stable@libav.org
Bug-Id: CID 732218

3 weeks agolavd/v4l2: don't use avpriv_ prefix for internal functions
James Almer [Tue, 21 Oct 2014 06:56:06 +0000 (03:56 -0300)]
lavd/v4l2: don't use avpriv_ prefix for internal functions

No need to keep the old symbols around until a major bump since lavd functions
with the avpriv_ prefix were never exposed.

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavcodec/utils: Align dimensions by at least their chroma sub-sampling factors.
Michael Niedermayer [Wed, 29 Oct 2014 13:15:29 +0000 (14:15 +0100)]
avcodec/utils: Align dimensions by at least their chroma sub-sampling factors.

Fixes: out of array accesses
Fixes: asan_heap-oob_112c6b3_13_012.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavcodec/libutvideodec: Try to fix build failure with old libutvideo
Michael Niedermayer [Wed, 29 Oct 2014 12:15:26 +0000 (13:15 +0100)]
avcodec/libutvideodec: Try to fix build failure with old libutvideo

Found-by: Jan Ehrhardt <phpdev@ehrhardt.nl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavformat/mxfenc: AVC Intra support
Thomas Mundt [Tue, 28 Oct 2014 22:38:22 +0000 (22:38 +0000)]
avformat/mxfenc: AVC Intra support

To keep h264 parsing simple and fast, I used the framesize for selecting the right Panasonic codec label. The framesize is fixed for Panasonic AVC Intra.

This patch only supports AVCI50/100. But in all flavours, i.e. with no SPS/PPS in header.

Reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoImprove the fieldmatch documentation about mixed telecined content.
Carl Eugen Hoyos [Wed, 29 Oct 2014 09:17:37 +0000 (10:17 +0100)]
Improve the fieldmatch documentation about mixed telecined content.

The fieldmatch filter has no problem with mixed telecined and
progressive content but the decimate filter does not detect the
changing framerate and drops progressive frames.

3 weeks agoavformat/mxfdec: fix null pointer dereference
Michael Niedermayer [Wed, 29 Oct 2014 02:54:06 +0000 (03:54 +0100)]
avformat/mxfdec: fix null pointer dereference

Fixes: signal_sigsegv_b5b3d4_2_001.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Wed, 29 Oct 2014 01:01:10 +0000 (02:01 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Mention in the documentation that fieldmatch needs cfr input.
  Use v4l2 input format automatically if filename starts with "/dev/video"
  Print a warning if a subtitle demuxer changes utf16 to utf8.
  Do not set the lame quality if the user didn't request it.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoMention in the documentation that fieldmatch needs cfr input.
Carl Eugen Hoyos [Wed, 29 Oct 2014 00:59:52 +0000 (01:59 +0100)]
Mention in the documentation that fieldmatch needs cfr input.

This can be improved in the decimate filter but for the moment
explicitely mentioning that mixed telecined and progressive
content is unsupported is an improvement.

Fixes ticket #3968.

3 weeks agoUse v4l2 input format automatically if filename starts with "/dev/video"
Andrey Utkin [Wed, 29 Oct 2014 00:59:25 +0000 (01:59 +0100)]
Use v4l2 input format automatically if filename starts with "/dev/video"

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
3 weeks agoPrint a warning if a subtitle demuxer changes utf16 to utf8.
Carl Eugen Hoyos [Wed, 29 Oct 2014 00:32:44 +0000 (01:32 +0100)]
Print a warning if a subtitle demuxer changes utf16 to utf8.

This does not fix anything but gives users a chance to
know that they must not pass -sub_charenc UTF-16 to ffmpeg.

Fixes ticket #4059.

3 weeks agoDo not set the lame quality if the user didn't request it.
Carl Eugen Hoyos [Wed, 29 Oct 2014 00:31:06 +0000 (01:31 +0100)]
Do not set the lame quality if the user didn't request it.

This makes FFmpeg's mp3 output more similar to lame's output.

3 weeks agoavcodec/dnxhddec: treat pix_fmt like width/height
Michael Niedermayer [Tue, 28 Oct 2014 23:57:07 +0000 (00:57 +0100)]
avcodec/dnxhddec: treat pix_fmt like width/height

Fixes out of array accesses
Fixes: asan_heap-oob_22c9a39_16_015.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agomxfdec: Tighten RIP length bounds in mxf_read_random_index_pack()
Tomas Härdin [Tue, 28 Oct 2014 13:36:27 +0000 (14:36 +0100)]
mxfdec: Tighten RIP length bounds in mxf_read_random_index_pack()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agomxfdec: Merge last_partition and footer_partition
Tomas Härdin [Tue, 28 Oct 2014 13:27:06 +0000 (14:27 +0100)]
mxfdec: Merge last_partition and footer_partition

FooterPartition offset specified in RIP takes precedence over any value written
in PartitionPacks. This fixes the same issue f06f6da tries to fix without
introducing an extra variable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoRevert "avformat/mxfdec: detect loops during header parsing"
Tomas Härdin [Tue, 28 Oct 2014 12:33:47 +0000 (13:33 +0100)]
Revert "avformat/mxfdec: detect loops during header parsing"

This reverts commit 1c010fd035c1a14dc73827b84f21f593e969a5d6.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agomxfdec: Parse PreviousPartition in mxf_seek_to_previous_partition()
Tomas Härdin [Tue, 28 Oct 2014 12:38:18 +0000 (13:38 +0100)]
mxfdec: Parse PreviousPartition in mxf_seek_to_previous_partition()

Without this patch the demuxer can get stuck in a loop if PreviousPartition
points somewhere where there's no PartitionPack, or if klv_read_packet() syncs
back up to the current partition.

This should fix Ticket3278 properly and unbreak Ticket4040.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agomxfdec: Break out parts of mxf_read_header() into separate functions
Tomas Härdin [Tue, 28 Oct 2014 12:33:04 +0000 (13:33 +0100)]
mxfdec: Break out parts of mxf_read_header() into separate functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoUpdate README.chromium with additional details. 68/71668/3
John Rummell [Thu, 25 Sep 2014 22:52:14 +0000 (15:52 -0700)]
Update README.chromium with additional details.

Change-Id: Ie1a82bed36129981081b8fef232bcda2e42faf6f

3 weeks agoavformat/mvdec: Check size in read_table() for validity
Michael Niedermayer [Tue, 28 Oct 2014 15:59:50 +0000 (16:59 +0100)]
avformat/mvdec: Check size in read_table() for validity

This check is redundant with the previous commit but it provides
better error messages and feedback while the previous commit
ensures that var_read_string() doesnt return uninitialized arrays
if it itself is feeded with an invalid size possibly through a
different future codepath.

Fixes: asan_heap-oob_49b1e5_12_011.movie
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavformat/mvdec: Check size for validity in var_read_string()
Michael Niedermayer [Tue, 28 Oct 2014 15:42:05 +0000 (16:42 +0100)]
avformat/mvdec: Check size for validity in var_read_string()

Fixes out of array read
Fixes: asan_heap-oob_49b1e5_12_011.movie
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavcodec/dxa: check dimensions
Michael Niedermayer [Tue, 28 Oct 2014 14:26:42 +0000 (15:26 +0100)]
avcodec/dxa: check dimensions

Fixes out of array access
Fixes: asan_heap-oob_11222fb_21_020.dxa
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoconfigure: Check only for xcb
Luca Barbato [Tue, 28 Oct 2014 09:43:52 +0000 (10:43 +0100)]
configure: Check only for xcb

xcb-utils are not needed anymore.

3 weeks agodvenc: mark encoder as intra
Christophe Gisquet [Wed, 15 Oct 2014 16:37:34 +0000 (18:37 +0200)]
dvenc: mark encoder as intra

And thus allow various multithreading.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agodv: increase VLC reading bits to 10
Christophe Gisquet [Tue, 14 Oct 2014 00:02:36 +0000 (02:02 +0200)]
dv: increase VLC reading bits to 10

This also requires a bump in the table size of bit patterns to 1664.
From 356 to 348 cycles.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavdevice/xcbgrab: set avclass category
Michael Niedermayer [Tue, 28 Oct 2014 11:07:20 +0000 (12:07 +0100)]
avdevice/xcbgrab: set avclass category

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoMerge commit '4ad1eba011860224831ce0bb3123f6f55716b68a'
Michael Niedermayer [Tue, 28 Oct 2014 10:16:17 +0000 (11:16 +0100)]
Merge commit '4ad1eba011860224831ce0bb3123f6f55716b68a'

* commit '4ad1eba011860224831ce0bb3123f6f55716b68a':
  lavd: fix building x11grab after a6674d2

no change as the buggy line was not in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoMerge commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745'
Michael Niedermayer [Tue, 28 Oct 2014 10:04:51 +0000 (11:04 +0100)]
Merge commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745'

* commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745':
  vdpau: return MAIN instead of BASELINE for H.264 CBP

Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoMerge commit '26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893'
Michael Niedermayer [Tue, 28 Oct 2014 09:58:03 +0000 (10:58 +0100)]
Merge commit '26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893'

* commit '26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893':
  vdpau/h264: request MAIN rather than BASELINE VDPAU profile for CBP

Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agolavd: fix building x11grab after a6674d2
Anton Khirnov [Tue, 28 Oct 2014 06:22:00 +0000 (07:22 +0100)]
lavd: fix building x11grab after a6674d2

3 weeks agovdpau: return MAIN instead of BASELINE for H.264 CBP
Rémi Denis-Courmont [Sun, 26 Oct 2014 19:33:58 +0000 (21:33 +0200)]
vdpau: return MAIN instead of BASELINE for H.264 CBP

This is the same as the previous change, but for applications using the
old API (such as VLC 2.2).

Signed-off-by: Anton Khirnov <anton@khirnov.net>
3 weeks agovdpau/h264: request MAIN rather than BASELINE VDPAU profile for CBP
Rémi Denis-Courmont [Sun, 26 Oct 2014 19:24:12 +0000 (21:24 +0200)]
vdpau/h264: request MAIN rather than BASELINE VDPAU profile for CBP

The H.264 Constrained Baseline Profile (CBP) is a subset of both the
Main Profile and the Baseline Profile. In principles, a hardware
decoder that supports either of those can decode CBP content. As it
happens, Main is supported by all VDPAU drivers, and Baseline is not.

So favor map CBP to MP for now. Hopefully in the future libvdpau will
offer an explicit choice for CBP.

This fixes bug 757.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
3 weeks agoavcodec/dirac_arith: fix integer overflow
Michael Niedermayer [Tue, 28 Oct 2014 01:14:41 +0000 (02:14 +0100)]
avcodec/dirac_arith: fix integer overflow

Fixes: asan_heap-oob_1078676_9_008.drc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavcodec/diracdec: Tighter checks on CODEBLOCKS_X/Y
Michael Niedermayer [Tue, 28 Oct 2014 00:23:40 +0000 (01:23 +0100)]
avcodec/diracdec: Tighter checks on CODEBLOCKS_X/Y

Fixes very long but finite loop
Fixes: asan_heap-oob_107866c_42_041.drc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavcodec/diracdec: Use 64bit in calculation of codeblock coordinates
Michael Niedermayer [Tue, 28 Oct 2014 00:23:40 +0000 (01:23 +0100)]
avcodec/diracdec: Use 64bit in calculation of codeblock coordinates

Fixes integer overflow
Fixes out of array read
Fixes: asan_heap-oob_107866c_42_041.drc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoInclude version number when building ffmpegsumo.dll 03/72003/2
John Rummell [Thu, 23 Oct 2014 22:21:53 +0000 (15:21 -0700)]
Include version number when building ffmpegsumo.dll

BUG=426252

Change-Id: I64e9e2ad409673b8ca4e0424602abbac0b9a9450

3 weeks agoMerge commit '11467ecf519788f2e2f49c63a17eb600e618489e'
Michael Niedermayer [Mon, 27 Oct 2014 22:33:39 +0000 (23:33 +0100)]
Merge commit '11467ecf519788f2e2f49c63a17eb600e618489e'

* commit '11467ecf519788f2e2f49c63a17eb600e618489e':
  mxfdec: reduce loop bound in mxf_read_pixel_layout()

See: 187630b2449f1eae1096f81f31bab7d81bed3cf1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavformat/bethsoftvid: print error in case the side date failed to be allocated
Michael Niedermayer [Mon, 27 Oct 2014 22:20:21 +0000 (23:20 +0100)]
avformat/bethsoftvid: print error in case the side date failed to be allocated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoMerge commit 'e6c66f1e4ea19a3aa6ed999c5cb92e1b682c7600'
Michael Niedermayer [Mon, 27 Oct 2014 22:08:50 +0000 (23:08 +0100)]
Merge commit 'e6c66f1e4ea19a3aa6ed999c5cb92e1b682c7600'

* commit 'e6c66f1e4ea19a3aa6ed999c5cb92e1b682c7600':
  bethsoftvid: check return value and clean memory

Conflicts:
libavformat/bethsoftvid.c

See: 3632f35c8e163f6aa6d63c317e3e1fca6a4a5fab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavformat/filmstripdec: Fix several integer overflows
Michael Niedermayer [Mon, 27 Oct 2014 21:56:04 +0000 (22:56 +0100)]
avformat/filmstripdec: Fix several integer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoMerge commit 'b46b233baffc2076a1a17a264ba9553ae0d4878f'
Michael Niedermayer [Mon, 27 Oct 2014 21:25:37 +0000 (22:25 +0100)]
Merge commit 'b46b233baffc2076a1a17a264ba9553ae0d4878f'

* commit 'b46b233baffc2076a1a17a264ba9553ae0d4878f':
  filmstripdec: avoid integer overflow

Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoMerge commit '090c67d586e3916f9acc49e010b6389d07f97153'
Michael Niedermayer [Mon, 27 Oct 2014 21:18:03 +0000 (22:18 +0100)]
Merge commit '090c67d586e3916f9acc49e010b6389d07f97153'

* commit '090c67d586e3916f9acc49e010b6389d07f97153':
  matroskaenc: write correct Display{Width, Height} in stereo encoding

Conflicts:
libavformat/matroskaenc.c

See: 6103faaa51d2f46d6ccecaad9a089b4b42ff66ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoMerge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96'
Michael Niedermayer [Mon, 27 Oct 2014 20:26:51 +0000 (21:26 +0100)]
Merge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96'

* commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96':
  xcbgrab: XCB-based screen capture

Conflicts:
Changelog
configure
libavdevice/Makefile
libavdevice/alldevices.c
libavdevice/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavcodec/sgidec: fix count check
Michael Niedermayer [Mon, 27 Oct 2014 19:48:58 +0000 (20:48 +0100)]
avcodec/sgidec: fix count check

Fixes: asan_heap-oob_22b30d4_39_038.sgi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavcodec/sgidec: fix linesize for 16bit
Michael Niedermayer [Mon, 27 Oct 2014 19:48:58 +0000 (20:48 +0100)]
avcodec/sgidec: fix linesize for 16bit

Fixes: asan_heap-oob_22b30d4_39_038.sgi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agomxfdec: reduce loop bound in mxf_read_pixel_layout()
Tomas Härdin [Mon, 27 Oct 2014 12:59:48 +0000 (13:59 +0100)]
mxfdec: reduce loop bound in mxf_read_pixel_layout()

Makes coverity less confused and code more readable.

Bug-Id: CID 732262

3 weeks agobethsoftvid: check return value and clean memory
Vittorio Giovara [Fri, 24 Oct 2014 12:15:34 +0000 (13:15 +0100)]
bethsoftvid: check return value and clean memory

CC: libav-stable@libav.org
Bug-Id: CID 733777

3 weeks agofilmstripdec: avoid integer overflow
Vittorio Giovara [Fri, 24 Oct 2014 12:15:39 +0000 (13:15 +0100)]
filmstripdec: avoid integer overflow

CC: libav-stable@libav.org
Bug-Id: CID 732246

3 weeks agomatroskaenc: write correct Display{Width, Height} in stereo encoding
Vittorio Giovara [Wed, 22 Oct 2014 13:36:32 +0000 (14:36 +0100)]
matroskaenc: write correct Display{Width, Height} in stereo encoding

should be the raw amount of pixels (for example 3840x1080 for full HD side by
side) and the DisplayWidth/Height in pixels should be the amount of pixels for
one plane (1920x1080 for that full HD stream)."

So, move the aspect ratio check in the mkv_write_stereo_mode() function
and always write the embl when stereo format and/or aspect ration is set.
Also add a few comments to that function.

CC: libav-stable@libav.org
Found-by: Asan Usipov <asan.usipov@gmail.com>
3 weeks agolavd/avfoundation: Fix compilation for non MAC OS devices by conditional compilation...
Thilo Borgmann [Mon, 27 Oct 2014 14:20:27 +0000 (15:20 +0100)]
lavd/avfoundation: Fix compilation for non MAC OS devices by conditional compilation of screen capture capabilities.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavcodec/hevc_ps: Check default display window bitstream and skip if invalid
Michael Niedermayer [Mon, 27 Oct 2014 13:03:09 +0000 (14:03 +0100)]
avcodec/hevc_ps: Check default display window bitstream and skip if invalid

Fixes Ticket4035

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavcodec/h264_parser: rewrite the parse_nal_units() loop logic based on h264.c
Michael Niedermayer [Mon, 27 Oct 2014 03:30:11 +0000 (04:30 +0100)]
avcodec/h264_parser: rewrite the parse_nal_units() loop logic based on h264.c

Fixes Ticket4011

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavcodec/h264: simplify find_start_code()
Michael Niedermayer [Mon, 27 Oct 2014 03:24:20 +0000 (04:24 +0100)]
avcodec/h264: simplify find_start_code()

this also uses avpriv_find_start_code(), though no speed change is expected as
the area searched is generally small

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoMove get_avc_nalsize() and find_start_code() to h264.h
Michael Niedermayer [Mon, 27 Oct 2014 03:22:42 +0000 (04:22 +0100)]
Move get_avc_nalsize() and find_start_code() to h264.h

This allows sharing them with the h264 parser

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavformat/mpegts: Add support for Opus in MPEG-TS
Kieran Kunhya [Fri, 17 Oct 2014 23:25:16 +0000 (00:25 +0100)]
avformat/mpegts: Add support for Opus in MPEG-TS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavcodec: Add support for Opus in MPEG-TS
Kieran Kunhya [Fri, 17 Oct 2014 23:25:16 +0000 (00:25 +0100)]
avcodec: Add support for Opus in MPEG-TS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agodv: move inverse weight tables to decoder
Christophe Gisquet [Sat, 25 Oct 2014 11:19:25 +0000 (11:19 +0000)]
dv: move inverse weight tables to decoder

The encoder has its own tables and does not access the idct_factor
member of the DVVideoContext structure.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agodv: fix weight table for 2x4x8 transform
Christophe Gisquet [Sat, 25 Oct 2014 11:19:23 +0000 (11:19 +0000)]
dv: fix weight table for 2x4x8 transform

The coefficients must be in the appropriate zigzag scan order.
Also fix their values at the same time, as they were pretty wrong.

Fixes ticket #2970.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavutil/intmath: enable builtin intrinsics for icl and msvc.
Matthew Oliver [Sun, 26 Oct 2014 14:43:15 +0000 (01:43 +1100)]
avutil/intmath: enable builtin intrinsics for icl and msvc.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoffmpeg_opt: Check the return code from strftime()
Michael Niedermayer [Sun, 26 Oct 2014 14:52:12 +0000 (15:52 +0100)]
ffmpeg_opt: Check the return code from strftime()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavformat/matroskadec: Check the return code from strftime()
Michael Niedermayer [Sun, 26 Oct 2014 14:51:58 +0000 (15:51 +0100)]
avformat/matroskadec: Check the return code from strftime()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoavformat/mlvdec: Check the return code from strftime()
Michael Niedermayer [Sun, 26 Oct 2014 14:51:37 +0000 (15:51 +0100)]
avformat/mlvdec: Check the return code from strftime()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
3 weeks agoxcbgrab: XCB-based screen capture
Luca Barbato [Sun, 24 Aug 2014 12:18:22 +0000 (14:18 +0200)]
xcbgrab: XCB-based screen capture

Matches the x11grab screen capture by features.

4 weeks agoMerge commit 'ed6dad3737bf7bb2d5e9fa9511dfdb44806010e8'
Michael Niedermayer [Sun, 26 Oct 2014 02:22:28 +0000 (03:22 +0100)]
Merge commit 'ed6dad3737bf7bb2d5e9fa9511dfdb44806010e8'

* commit 'ed6dad3737bf7bb2d5e9fa9511dfdb44806010e8':
  lavf: Implement ff_brktimegm using gmtime_r

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoMerge commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6'
Michael Niedermayer [Sun, 26 Oct 2014 02:12:37 +0000 (03:12 +0100)]
Merge commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6'

* commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6':
  drawtext: Remove the ifdef for localtime_r

Conflicts:
libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 weeks agoMerge commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de'
Michael Niedermayer [Sun, 26 Oct 2014 01:38:26 +0000 (02:38 +0100)]
Merge commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de'

* commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de':
  Use gmtime_r instead of gmtime and localtime_r instead of localtime

Conflicts:
libavformat/mov.c
libavformat/mxfenc.c
libavformat/wtvdec.c
libavutil/parseutils.c

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