ffmpeg.git
6 years agoavformat: add webp muxer
Michael Niedermayer [Fri, 31 Oct 2014 15:10:33 +0000 (16:10 +0100)]
avformat: add webp muxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/assenc: Add ignore_gaps option
Rodger Combs [Fri, 31 Oct 2014 01:16:08 +0000 (20:16 -0500)]
avformat/assenc: Add ignore_gaps option

Signed-off-by: Clément Bœsch <u@pkh.me>
6 years agoavfilter/idet: add current frame classification to metadata
Kevin Mitchell [Sat, 1 Nov 2014 11:10:15 +0000 (04:10 -0700)]
avfilter/idet: add current frame classification to metadata

Fixes ticket 3832

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/idet: add metadata to "current" frame instead of "next" frame
Kevin Mitchell [Sat, 1 Nov 2014 11:10:15 +0000 (04:10 -0700)]
avfilter/idet: add metadata to "current" frame instead of "next" frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/rtpdec_h261: code aligned to the HEVC code
Thomas Volkert [Sat, 1 Nov 2014 12:01:53 +0000 (13:01 +0100)]
avformat/rtpdec_h261: code aligned to the HEVC code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg4vdpau: Fix priv data size.
Reimar Döffinger [Sat, 1 Nov 2014 12:01:38 +0000 (13:01 +0100)]
mpeg4vdpau: Fix priv data size.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoavcodec/pthread_slice: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Sat, 1 Nov 2014 10:22:06 +0000 (11:22 +0100)]
avcodec/pthread_slice: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/pthread_frame: Simplify code by using av_reallocp_array()
Michael Niedermayer [Sat, 1 Nov 2014 09:51:08 +0000 (10:51 +0100)]
avcodec/pthread_frame: Simplify code by using av_reallocp_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/parser: use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Sat, 1 Nov 2014 09:50:18 +0000 (10:50 +0100)]
avcodec/parser: use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffserver_config: fix compilation warning
Lukasz Marek [Sat, 1 Nov 2014 01:11:52 +0000 (02:11 +0100)]
ffserver_config: fix compilation warning

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
6 years agoffserver_config: postpone codec context creation
Lukasz Marek [Sun, 19 Oct 2014 19:29:40 +0000 (21:29 +0200)]
ffserver_config: postpone codec context creation

So far AVCodecContext was created without codec specified.
This causes internal data to not be initialized to defaults.

This commit postpone context creation until all information is gathered.

Partially fixes #1275

6 years agolavd/alsa: implement get_device_list callbacks
Lukasz Marek [Tue, 26 Aug 2014 18:30:35 +0000 (20:30 +0200)]
lavd/alsa: implement get_device_list callbacks

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
6 years agodoc/formats: document libavformats bitexact flag
Michael Niedermayer [Fri, 31 Oct 2014 22:28:45 +0000 (23:28 +0100)]
doc/formats: document libavformats bitexact flag

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: document -dump_separator
Michael Niedermayer [Fri, 31 Oct 2014 22:05:02 +0000 (23:05 +0100)]
doc: document -dump_separator

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mjpegenc: use av_freep(), avoid leaving stale pointers in memory
Michael Niedermayer [Fri, 31 Oct 2014 12:36:19 +0000 (13:36 +0100)]
avcodec/mjpegenc: use av_freep(), avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: fix escaping in xcb cflags / libs
Michael Niedermayer [Fri, 31 Oct 2014 10:45:21 +0000 (11:45 +0100)]
configure: fix escaping in xcb cflags / libs

Fixes build with open64

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'aae6b3b918b4133b8cc2d1631196c1d406d0351a'
Michael Niedermayer [Fri, 31 Oct 2014 01:51:04 +0000 (02:51 +0100)]
Merge commit 'aae6b3b918b4133b8cc2d1631196c1d406d0351a'

* commit 'aae6b3b918b4133b8cc2d1631196c1d406d0351a':
  movenc: Don't write any iso brands in ismv files

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c55d1d382cd41345a79782ace41f9b43f45dca9a'
Michael Niedermayer [Fri, 31 Oct 2014 01:31:59 +0000 (02:31 +0100)]
Merge commit 'c55d1d382cd41345a79782ace41f9b43f45dca9a'

* commit 'c55d1d382cd41345a79782ace41f9b43f45dca9a':
  movenc: Don't write any tfdt atom for ismv files

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '00c67fe1d0bc7c2ce49daac9c80ea39d5a663b73'
Michael Niedermayer [Fri, 31 Oct 2014 01:11:19 +0000 (02:11 +0100)]
Merge commit '00c67fe1d0bc7c2ce49daac9c80ea39d5a663b73'

* commit '00c67fe1d0bc7c2ce49daac9c80ea39d5a663b73':
  movenc: Write a 0 duration in mdhd and tkhd for an empty initial moov

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'cf589faa5b7aed3bb38e08dcd00bd951e69686d1'
Michael Niedermayer [Fri, 31 Oct 2014 00:46:25 +0000 (01:46 +0100)]
Merge commit 'cf589faa5b7aed3bb38e08dcd00bd951e69686d1'

* commit 'cf589faa5b7aed3bb38e08dcd00bd951e69686d1':
  movenc: Add a flag for using default-base-is-moof in tfhd atoms

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: Add documentation for the whitelist options
Michael Niedermayer [Fri, 31 Oct 2014 00:36:47 +0000 (01:36 +0100)]
doc: Add documentation for the whitelist options

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264_parser: Use av_freep() to avoid leaving stale pointers
Michael Niedermayer [Thu, 30 Oct 2014 22:58:52 +0000 (23:58 +0100)]
avcodec/h264_parser: Use av_freep() to avoid leaving stale pointers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/cngdec: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Thu, 30 Oct 2014 22:36:51 +0000 (23:36 +0100)]
avcodec/cngdec: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/crystalhd: use av_freep() to avoid stale pointers
Michael Niedermayer [Thu, 30 Oct 2014 22:35:32 +0000 (23:35 +0100)]
avcodec/crystalhd: use av_freep() to avoid stale pointers

this leaves some av_free() where the pointer is overwritten
shortly later

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/dvbsubdec: use av_freep() to avoid leaving stale pointers
Michael Niedermayer [Thu, 30 Oct 2014 22:29:33 +0000 (23:29 +0100)]
avcodec/dvbsubdec: use av_freep() to avoid leaving stale pointers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/dvbsubdec: merge declaration and init
Michael Niedermayer [Thu, 30 Oct 2014 22:28:15 +0000 (23:28 +0100)]
avcodec/dvbsubdec: merge declaration and init

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomovenc: Don't write any iso brands in ismv files
Martin Storsjö [Wed, 29 Oct 2014 20:55:23 +0000 (22:55 +0200)]
movenc: Don't write any iso brands in ismv files

We deviate slightly from the iso specs for these files.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomovenc: Don't write any tfdt atom for ismv files
Martin Storsjö [Thu, 30 Oct 2014 07:35:10 +0000 (09:35 +0200)]
movenc: Don't write any tfdt atom for ismv files

The tfdt atom shouldn't be needed in those cases, we already
write tfxd atoms for ismv anyway, which is roughly equivalent.

This avoids having to declare the iso6 brand for ismv files.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomovenc: Write a 0 duration in mdhd and tkhd for an empty initial moov
Martin Storsjö [Wed, 29 Oct 2014 20:51:29 +0000 (22:51 +0200)]
movenc: Write a 0 duration in mdhd and tkhd for an empty initial moov

ISO/IEC 14496-12:2012/Cor 1:2013 is explicit about how this should be
handled. All zeros doesn't mean that the full file has got a zero
duration, only that the track samples described within the initial moov
have got zero duration. An all ones duration means an indeterminate
duration.

Keep writing a duration consisting of all ones for the ISM mode -
older windows media player versions won't play a file if this is
zero. (Newer windows media player versions play either version fine.)

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavcodec/dxtory: use unaligned copy for unaligned addresses
Michael Niedermayer [Thu, 30 Oct 2014 18:24:49 +0000 (19:24 +0100)]
avcodec/dxtory: use unaligned copy for unaligned addresses

Fixes undefined behavior
Fixes: asan_heap-oob_112c6b3_13_012.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/svq1dec: zero terminate embedded message before printing
Michael Niedermayer [Thu, 30 Oct 2014 17:16:25 +0000 (18:16 +0100)]
avcodec/svq1dec: zero terminate embedded message before printing

Fixes out of array access
Fixes: asan_stack-oob_49b1e5_10_009.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/cook: check that the subpacket sizes fit in block_align
Michael Niedermayer [Thu, 30 Oct 2014 15:53:09 +0000 (16:53 +0100)]
avcodec/cook: check that the subpacket sizes fit in block_align

Fixes out of array read
Fixes: asan_heap-oob_fb5c50_19_018.rmvb
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavdevice/xcbgrab: Fix offset support
Michael Niedermayer [Thu, 30 Oct 2014 11:48:05 +0000 (12:48 +0100)]
avdevice/xcbgrab: Fix offset support

Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffprobe.xsd: add packets_and_frames element definition
Tobias Rapp [Thu, 23 Oct 2014 13:17:55 +0000 (15:17 +0200)]
ffprobe.xsd: add packets_and_frames element definition

This allows validation of ffprobe XML output if -show_packets and
-show_frames are both set.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agoFix compilation of xcbgrab if xcb/shape.h is not available.
Carl Eugen Hoyos [Thu, 30 Oct 2014 09:22:34 +0000 (10:22 +0100)]
Fix compilation of xcbgrab if xcb/shape.h is not available.

Old versions of libxcb do not provide xcb_shape_rectangles().
The issue can be fixed differently but this small change fixes
some fate platforms and a user reported compilation problem.

Reported and tested by trac user kevmitch.
Fixes ticket #4067.

6 years agoFix xcbgrab build if shm is not available.
Carl Eugen Hoyos [Thu, 30 Oct 2014 09:05:45 +0000 (10:05 +0100)]
Fix xcbgrab build if shm is not available.

6 years agoFix disabling libxcb-shm and libxcb-xfixes.
Carl Eugen Hoyos [Thu, 30 Oct 2014 09:03:45 +0000 (10:03 +0100)]
Fix disabling libxcb-shm and libxcb-xfixes.

6 years agoMerge commit '600d5ee6b12bad144756b0772319bb04796bc528'
Michael Niedermayer [Thu, 30 Oct 2014 01:45:55 +0000 (02:45 +0100)]
Merge commit '600d5ee6b12bad144756b0772319bb04796bc528'

* commit '600d5ee6b12bad144756b0772319bb04796bc528':
  movenc: Signal iso6 in compatible_brands when using tfdt

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a9911a1b2df37ca808e06dc30627215f4ec9a9e4'
Michael Niedermayer [Thu, 30 Oct 2014 01:45:36 +0000 (02:45 +0100)]
Merge commit 'a9911a1b2df37ca808e06dc30627215f4ec9a9e4'

* commit 'a9911a1b2df37ca808e06dc30627215f4ec9a9e4':
  doc: Document the omit_tfhd_offset flag to the mp4 muxer

Conflicts:
doc/muxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1e0b81abe86dc09dd34d60d57f92de5f12d65818'
Michael Niedermayer [Thu, 30 Oct 2014 01:36:53 +0000 (02:36 +0100)]
Merge commit '1e0b81abe86dc09dd34d60d57f92de5f12d65818'

* commit '1e0b81abe86dc09dd34d60d57f92de5f12d65818':
  movenc: Use a local variable consistently

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b2b79eca6fae2466a53c5daa163a37e2474364fc'
Michael Niedermayer [Thu, 30 Oct 2014 01:24:49 +0000 (02:24 +0100)]
Merge commit 'b2b79eca6fae2466a53c5daa163a37e2474364fc'

* commit 'b2b79eca6fae2466a53c5daa163a37e2474364fc':
  movenc: Don't check the custom IO flag when using faststart

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '573b1de2d7f1db71030f91ecdded7d0bc071f6b6'
Michael Niedermayer [Thu, 30 Oct 2014 01:15:39 +0000 (02:15 +0100)]
Merge commit '573b1de2d7f1db71030f91ecdded7d0bc071f6b6'

* commit '573b1de2d7f1db71030f91ecdded7d0bc071f6b6':
  movenc: Don't use track_id to decide which track is the first in a moof

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/g2meet: check tile dimensions to avoid integer overflow
Michael Niedermayer [Thu, 30 Oct 2014 00:19:17 +0000 (01:19 +0100)]
avcodec/g2meet: check tile dimensions to avoid integer overflow

Fixes out of array access
Fixes: asan_heap-oob_12a55d3_30_029.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years 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.

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

6 years 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>
6 years 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>
6 years 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>
6 years agomovenc: Add a flag for using default-base-is-moof in tfhd atoms
Martin Storsjö [Wed, 29 Oct 2014 09:53:21 +0000 (11:53 +0200)]
movenc: Add a flag for using default-base-is-moof in tfhd atoms

Similarly to the omit_tfhd_offset flag added in e7bf085b, this
avoids writing absolute byte positions to the file, making them
more easily streamable.

This is a new feature from 14496-12:2012, so application support
isn't necessarily too widespread yet (support for it in libav was
added in 20f95f21f in July 2014).

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomovenc: Signal iso6 in compatible_brands when using tfdt
Martin Storsjö [Wed, 29 Oct 2014 15:00:38 +0000 (17:00 +0200)]
movenc: Signal iso6 in compatible_brands when using tfdt

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agodoc: Document the omit_tfhd_offset flag to the mp4 muxer
Martin Storsjö [Wed, 29 Oct 2014 13:30:22 +0000 (14:30 +0100)]
doc: Document the omit_tfhd_offset flag to the mp4 muxer

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomovenc: Use a local variable consistently
Martin Storsjö [Tue, 21 Oct 2014 08:36:22 +0000 (11:36 +0300)]
movenc: Use a local variable consistently

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomovenc: Don't check the custom IO flag when using faststart
Martin Storsjö [Tue, 21 Oct 2014 07:44:38 +0000 (10:44 +0300)]
movenc: Don't check the custom IO flag when using faststart

The custom IO flag actually never is set for muxers, only for
demuxers, so the check was pointless (unless a user intentionally
would set the flag to signal using custom IO).

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomovenc: Don't use track_id to decide which track is the first in a moof
Martin Storsjö [Wed, 29 Oct 2014 07:20:51 +0000 (09:20 +0200)]
movenc: Don't use track_id to decide which track is the first in a moof

If one track doesn't have any samples within a moof, no traf/trun
is written for it. When the omit_tfhd_offset flag is set, none
of the tfhd atoms have any base_data_offset set, and the implicit
offset (end of previous track fragment data, or start of the moof
for the first trun) is used.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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.

6 years 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>
6 years 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.

6 years 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

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

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

6 years 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

6 years 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

6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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.

6 years 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>
6 years 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>
6 years 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.

6 years 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>
6 years 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.

6 years 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.

6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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.

6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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

6 years 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>
6 years 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>