ffmpeg.git
6 years agoavcodec/g2meet: Fix framebuf size
Michael Niedermayer [Sat, 21 Sep 2013 21:34:11 +0000 (23:34 +0200)]
avcodec/g2meet: Fix framebuf size

Currently the code can in some cases draw tiles that hang outside the
allocated buffer. This patch increases the buffer size to avoid out
of array accesses. An alternative would be to fail if such tiles are
encountered.
I do not know if any valid files use such hanging tiles.

Fixes Ticket2971
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agochangelog: add fraps and libx264 changes
Compn [Sat, 21 Sep 2013 21:57:08 +0000 (17:57 -0400)]
changelog: add fraps and libx264 changes

6 years agoavformat/hls: do not limit manifest lines to 1024 chars
Michael Niedermayer [Sat, 21 Sep 2013 18:59:30 +0000 (20:59 +0200)]
avformat/hls: do not limit manifest lines to 1024 chars

Fixes Ticket2976
Debuged-by: jaimeMF
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: fix duplicate includes
Michael Niedermayer [Sat, 21 Sep 2013 14:59:13 +0000 (16:59 +0200)]
avcodec: fix duplicate includes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/network: fix duplicate include
Michael Niedermayer [Sat, 21 Sep 2013 14:58:58 +0000 (16:58 +0200)]
avformat/network: fix duplicate include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/libssh: add MAINTAINERS entry
Lukasz Marek [Sat, 21 Sep 2013 14:30:46 +0000 (16:30 +0200)]
lavf/libssh: add MAINTAINERS entry

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/attributes: Don't define av_restrict
Alex Smith [Sat, 21 Sep 2013 13:22:55 +0000 (09:22 -0400)]
lavu/attributes: Don't define av_restrict

This is always defined in config.h.

Original patch by Derek Buitenhuis.

6 years agoavformat: remove duplicate includes
Michael Niedermayer [Sat, 21 Sep 2013 13:11:12 +0000 (15:11 +0200)]
avformat: remove duplicate includes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavdevice/v4l: remove duplicate include
Michael Niedermayer [Sat, 21 Sep 2013 13:04:04 +0000 (15:04 +0200)]
avdevice/v4l: remove duplicate include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter: remove duplicate includes
Michael Niedermayer [Sat, 21 Sep 2013 13:02:34 +0000 (15:02 +0200)]
avfilter: remove duplicate includes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/cpu: remove duplicate include
Michael Niedermayer [Sat, 21 Sep 2013 12:55:57 +0000 (14:55 +0200)]
avutil/cpu: remove duplicate include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/fraps: use BT.709 colorspace for YUV Fraps versions
Hendrik Leppkes [Tue, 17 Sep 2013 18:26:43 +0000 (18:26 +0000)]
avcodec/fraps: use BT.709 colorspace for YUV Fraps versions

Based both on comparison to the reference decoder, and comments from
the fraps developers upon inquiry how to handle the yuv fraps variants.

6 years agolavfi/pad,crop,scale: remove options description from filter description
Paul B Mahol [Thu, 19 Sep 2013 17:39:08 +0000 (17:39 +0000)]
lavfi/pad,crop,scale: remove options description from filter description

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavfilter/vf_tinterlace: add yuv411p, yuv440p, yuva422p and yuva444p
Paul B Mahol [Fri, 20 Sep 2013 10:35:01 +0000 (10:35 +0000)]
avfilter/vf_tinterlace: add yuv411p, yuv440p, yuva422p and yuva444p

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotools: Fix apparent merge failure
Alex Smith [Sat, 21 Sep 2013 12:32:24 +0000 (08:32 -0400)]
tools: Fix apparent merge failure

6 years agomatroska: Add the CueDuration element
James Almer [Sat, 21 Sep 2013 01:15:49 +0000 (22:15 -0300)]
matroska: Add the CueDuration element

Use it only on subtitle CuePoints.
With proper demuxer/splitter support this should improve the display
of subtitles right after seeking to a given point in the stream.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 21 Sep 2013 12:07:36 +0000 (14:07 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Allow encoding YUVJ422P and YUVJ444P with libx264.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRemove '-vf' from pullup documentation example.
Carl Eugen Hoyos [Sat, 21 Sep 2013 10:17:20 +0000 (12:17 +0200)]
Remove '-vf' from pullup documentation example.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 21 Sep 2013 09:57:06 +0000 (11:57 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264dec: Add .avc file name extension

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9'
Michael Niedermayer [Sat, 21 Sep 2013 09:09:38 +0000 (11:09 +0200)]
Merge commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9'

* commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9':
  h264dec: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAllow encoding YUVJ422P and YUVJ444P with libx264.
Carl Eugen Hoyos [Sat, 21 Sep 2013 07:52:47 +0000 (09:52 +0200)]
Allow encoding YUVJ422P and YUVJ444P with libx264.

Reviewed-by: Reimar
6 years agompeg4dec: Ensure data is not clobbered too early.
Reimar Döffinger [Wed, 18 Sep 2013 23:08:30 +0000 (01:08 +0200)]
mpeg4dec: Ensure data is not clobbered too early.

Avoid overwriting the bitstream buffer data before we
have ended processing the frame.
This is necessary to fix hwaccels which might try to use
the buffer during the end_frame call.
I am not sure but it is possible this could even trigger
a use-after-free if the av_fast_malloc allocated a new buffer.
This would require that decode_slice did not wind the bitstream
forward all the way to the end, which does not currently happen in
normal streams.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoMerge commit '67e285ceca1cb602a5ab87010b30d904527924fe'
Michael Niedermayer [Sat, 21 Sep 2013 07:31:29 +0000 (09:31 +0200)]
Merge commit '67e285ceca1cb602a5ab87010b30d904527924fe'

* commit '67e285ceca1cb602a5ab87010b30d904527924fe':
  mem: Handle av_reallocp(..., 0) properly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add adelay test
Paul B Mahol [Thu, 19 Sep 2013 17:32:09 +0000 (17:32 +0000)]
fate: add adelay test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodvbsubdec: Check for invalid clut selector.
Reimar Döffinger [Wed, 18 Sep 2013 17:55:40 +0000 (19:55 +0200)]
dvbsubdec: Check for invalid clut selector.

Fail decoding if strict compliance is requested.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoApply clut changes only to one table.
JULIAN GARDNER [Wed, 4 Sep 2013 21:51:34 +0000 (22:51 +0100)]
Apply clut changes only to one table.

The specification does not allow multiple bits to be set,
but some encoders do it anyway.
Applying it only to the first seems to give better results.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agolavf: add SFTP protocol via libssh
Lukasz Marek [Wed, 18 Sep 2013 12:08:11 +0000 (14:08 +0200)]
lavf: add SFTP protocol via libssh

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoImprove pullup documentation.
Carl Eugen Hoyos [Sat, 21 Sep 2013 00:06:19 +0000 (02:06 +0200)]
Improve pullup documentation.

Mention that the fps filter should be used after pullup.

6 years agoavfilter/vf_psnr: avoid 64bit arithmetic in the inner loop
Michael Niedermayer [Sat, 21 Sep 2013 01:02:20 +0000 (03:02 +0200)]
avfilter/vf_psnr: avoid 64bit arithmetic in the inner loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_psnr: Prevent integer overflow.
Neil Birkbeck [Sat, 21 Sep 2013 00:25:40 +0000 (17:25 -0700)]
avfilter/vf_psnr: Prevent integer overflow.

The 32-bit integer accumulator in MSE computation can overflow for 8-bit frame data.
(e.g., for 1080p white frame compared to a black frame can give sum of 255*255*1080*1920 > 2^32).

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: remove unused variable
Michael Niedermayer [Fri, 20 Sep 2013 20:50:41 +0000 (22:50 +0200)]
avformat/utils: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/avienc: remove unused variable
Michael Niedermayer [Fri, 20 Sep 2013 20:50:06 +0000 (22:50 +0200)]
avformat/avienc: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskaenc: Add CuePoints for subtitle tracks
James Almer [Sat, 14 Sep 2013 08:59:21 +0000 (05:59 -0300)]
matroskaenc: Add CuePoints for subtitle tracks

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264dec: Add .avc file name extension
Vittorio Giovara [Fri, 20 Sep 2013 15:07:18 +0000 (17:07 +0200)]
h264dec: Add .avc file name extension

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoh264dec: K&R formatting cosmetics
Vittorio Giovara [Fri, 20 Sep 2013 15:28:04 +0000 (17:28 +0200)]
h264dec: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agomem: Handle av_reallocp(..., 0) properly
Martin Storsjö [Fri, 20 Sep 2013 11:02:41 +0000 (14:02 +0300)]
mem: Handle av_reallocp(..., 0) properly

Previously this did a double free (and returned an error).

Reported-by: Justin Ruggles
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 20 Sep 2013 14:08:19 +0000 (16:08 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: remove an unused static constant

Merge only for metadata as the constant us not unused in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '33b88f2a4ae54d5397c45e39a5326289ebdc7747'
Michael Niedermayer [Fri, 20 Sep 2013 14:02:17 +0000 (16:02 +0200)]
Merge commit '33b88f2a4ae54d5397c45e39a5326289ebdc7747'

* commit '33b88f2a4ae54d5397c45e39a5326289ebdc7747':
  msvc/icl: Use __declspec(noinline)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '09f2581dc5edb3642858d69d9a70b67e249167e9'
Michael Niedermayer [Fri, 20 Sep 2013 13:50:59 +0000 (15:50 +0200)]
Merge commit '09f2581dc5edb3642858d69d9a70b67e249167e9'

* commit '09f2581dc5edb3642858d69d9a70b67e249167e9':
  msvc/icl: Use __declspec(deprecated)

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91'
Michael Niedermayer [Fri, 20 Sep 2013 13:44:57 +0000 (15:44 +0200)]
Merge commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91'

* commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91':
  rtmp: Unbreak get_packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a9d50bb578ec04c085a25f1e023f75e0e4499d5e'
Michael Niedermayer [Fri, 20 Sep 2013 13:37:55 +0000 (15:37 +0200)]
Merge commit 'a9d50bb578ec04c085a25f1e023f75e0e4499d5e'

* commit 'a9d50bb578ec04c085a25f1e023f75e0e4499d5e':
  dcadec: Validate the lfe parameter

Conflicts:
libavcodec/dcadec.c

See: 3b2cd83a829e01a603b52fdc058a054b7899d06e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b97b1adb3f807e1acd00d56319ee6cb41cc727e4'
Michael Niedermayer [Fri, 20 Sep 2013 13:30:47 +0000 (15:30 +0200)]
Merge commit 'b97b1adb3f807e1acd00d56319ee6cb41cc727e4'

* commit 'b97b1adb3f807e1acd00d56319ee6cb41cc727e4':
  rtmpproto: Add a comment explaining the logic in handle_notify

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e5d45e028cf4193b562075897e55091779e49f15'
Michael Niedermayer [Fri, 20 Sep 2013 13:23:54 +0000 (15:23 +0200)]
Merge commit 'e5d45e028cf4193b562075897e55091779e49f15'

* commit 'e5d45e028cf4193b562075897e55091779e49f15':
  build: Support cparser

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd8798276b65543d921adadf63cc7f5ba2d1604af'
Michael Niedermayer [Fri, 20 Sep 2013 13:12:21 +0000 (15:12 +0200)]
Merge commit 'd8798276b65543d921adadf63cc7f5ba2d1604af'

* commit 'd8798276b65543d921adadf63cc7f5ba2d1604af':
  r3d: Add more input value validation

Conflicts:
libavformat/r3d.c

See: 99b1b2b1c65969ee324d754ea47e04a0a3f685a8
See: df92ac18528bac4566fc4f5ba4d607c1265791ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3ca14aa5964ea5d11f7a15f9fff17924d6096d44'
Michael Niedermayer [Fri, 20 Sep 2013 12:56:00 +0000 (14:56 +0200)]
Merge commit '3ca14aa5964ea5d11f7a15f9fff17924d6096d44'

* commit '3ca14aa5964ea5d11f7a15f9fff17924d6096d44':
  rl2: Avoid a division by zero

See: f371396dfb95c116a05e9b9f690fa916bb2d815e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '83c285f88016b087c2f0f4b9ef356ad8ef12d947'
Michael Niedermayer [Fri, 20 Sep 2013 12:51:02 +0000 (14:51 +0200)]
Merge commit '83c285f88016b087c2f0f4b9ef356ad8ef12d947'

* commit '83c285f88016b087c2f0f4b9ef356ad8ef12d947':
  wtv: Add more sanity checks for a length read from the file

Conflicts:
libavformat/wtv.c

See: c42efad3c34cace09555e05fd0cb81cb59cc726f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd8b68660145c76a23fc9665f96932449514ecad2'
Michael Niedermayer [Fri, 20 Sep 2013 12:37:52 +0000 (14:37 +0200)]
Merge commit 'd8b68660145c76a23fc9665f96932449514ecad2'

* commit 'd8b68660145c76a23fc9665f96932449514ecad2':
  yop: Clear all references to the AVBuffer in the local AVPacket

Conflicts:
libavformat/yop.c

See: 551f683861bbae1002542e70dc196244a1cd24ad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3185a80259ce1f8f8111073dbd14a69a396e03a3'
Michael Niedermayer [Fri, 20 Sep 2013 12:13:52 +0000 (14:13 +0200)]
Merge commit '3185a80259ce1f8f8111073dbd14a69a396e03a3'

* commit '3185a80259ce1f8f8111073dbd14a69a396e03a3':
  fraps: Make the input buffer size checks more strict

Conflicts:
libavcodec/fraps.c

The added checks are mostly to handle duplicate frames, which
we discard, thus there are also no P frames for example.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '82e266c6d3fbf3cc74e515b883e66543381a0f2c'
Michael Niedermayer [Fri, 20 Sep 2013 11:41:26 +0000 (13:41 +0200)]
Merge commit '82e266c6d3fbf3cc74e515b883e66543381a0f2c'

* commit '82e266c6d3fbf3cc74e515b883e66543381a0f2c':
  segafilm: Validate the number of audio channels

Merge only for metadata as the change is incorrect, checking audio
parameters in video only files

See: 192db16b9c202e8d037c4820b11e125d8010e7bc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: remove an unused static constant
Vittorio Giovara [Fri, 20 Sep 2013 11:09:23 +0000 (13:09 +0200)]
h264: remove an unused static constant

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomsvc/icl: Use __declspec(noinline)
Alex Smith [Thu, 19 Sep 2013 21:33:23 +0000 (17:33 -0400)]
msvc/icl: Use __declspec(noinline)

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomsvc/icl: Use __declspec(deprecated)
Alex Smith [Thu, 19 Sep 2013 20:58:21 +0000 (16:58 -0400)]
msvc/icl: Use __declspec(deprecated)

Prior to this on msvc/icl there was no handling of deprecated functions
and the deprecated warning was disabled.

After enabling there are a number of warnings relating to the CRT and
the use of the non-secure versions of several functions.  Defining
_CRT_SECURE_NO_WARNINGS silences these warnings.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortmp: Unbreak get_packet
Luca Barbato [Fri, 20 Sep 2013 09:55:20 +0000 (11:55 +0200)]
rtmp: Unbreak get_packet

Commit 5626f994f273af80fb100d4743b963304de9e05c broke it.

6 years agoMerge commit '601c2015bc16f0b281160292a6a760cbbbb0eacb'
Michael Niedermayer [Fri, 20 Sep 2013 11:29:39 +0000 (13:29 +0200)]
Merge commit '601c2015bc16f0b281160292a6a760cbbbb0eacb'

* commit '601c2015bc16f0b281160292a6a760cbbbb0eacb':
  svq3: Avoid a division by zero

Conflicts:
libavcodec/svq3.c

See: 4fa706a4a64f9e06b08c1a42a62893ff2f7de82f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7a5a55722749a3ab77941914707277b147322cbe'
Michael Niedermayer [Fri, 20 Sep 2013 11:20:06 +0000 (13:20 +0200)]
Merge commit '7a5a55722749a3ab77941914707277b147322cbe'

* commit '7a5a55722749a3ab77941914707277b147322cbe':
  qpeg: Add checks for running out of rows in qpeg_decode_inter

Conflicts:
libavcodec/qpeg.c

See: 4299dfa5ded84111231a456ad102f65f6f62649e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodcadec: Validate the lfe parameter
Martin Storsjö [Thu, 19 Sep 2013 12:12:06 +0000 (15:12 +0300)]
dcadec: Validate the lfe parameter

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge commit 'e9d61de96c113ee0ef8082833c7e682df0e23eec'
Michael Niedermayer [Fri, 20 Sep 2013 11:05:37 +0000 (13:05 +0200)]
Merge commit 'e9d61de96c113ee0ef8082833c7e682df0e23eec'

* commit 'e9d61de96c113ee0ef8082833c7e682df0e23eec':
  mpegaudiodec: Validate that the number of channels fits at the given offset

Conflicts:
libavcodec/mpegaudiodec.c

See: 51fcf276f8ce66be530549da6b8d96a4bd3087aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/asvdec: dont fail without extradata
Michael Niedermayer [Fri, 20 Sep 2013 10:50:05 +0000 (12:50 +0200)]
avcodec/asvdec: dont fail without extradata

extradata is not mandatory to decode asv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f50803354c6acb4575379d7c54ca48ec5d36dd61'
Michael Niedermayer [Fri, 20 Sep 2013 10:42:51 +0000 (12:42 +0200)]
Merge commit 'f50803354c6acb4575379d7c54ca48ec5d36dd61'

* commit 'f50803354c6acb4575379d7c54ca48ec5d36dd61':
  asvdec: Verify the amount of extradata

See: 605f2b6b004eee4dc57832257169ff8eaa562fb7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '72fe16a13e3ebd5396ac173bf84c8b20085c16d5'
Michael Niedermayer [Fri, 20 Sep 2013 10:37:24 +0000 (12:37 +0200)]
Merge commit '72fe16a13e3ebd5396ac173bf84c8b20085c16d5'

* commit '72fe16a13e3ebd5396ac173bf84c8b20085c16d5':
  movenc: Use null buffers for measuring the amount of data to be written

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3627ce2f1dab1d33b7f99d78907a3e4d86b7d847'
Michael Niedermayer [Fri, 20 Sep 2013 10:25:58 +0000 (12:25 +0200)]
Merge commit '3627ce2f1dab1d33b7f99d78907a3e4d86b7d847'

* commit '3627ce2f1dab1d33b7f99d78907a3e4d86b7d847':
  aviobuf: Add functions for null buffers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5'
Michael Niedermayer [Fri, 20 Sep 2013 09:56:26 +0000 (11:56 +0200)]
Merge commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5'

* commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5':
  asfenc: mux chapters in ASF files using an ASF "marker" section

Conflicts:
Changelog
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9'
Michael Niedermayer [Fri, 20 Sep 2013 09:43:32 +0000 (11:43 +0200)]
Merge commit '09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9'

* commit '09f3c937ed6fd7c5bd64450d45f73b0f4975f4c9':
  asfenc: remember send time and offset of the index entries

Conflicts:
libavformat/asfenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1eb932803037a3c9f98f66aeb80024dfa3c5c743'
Michael Niedermayer [Fri, 20 Sep 2013 09:18:13 +0000 (11:18 +0200)]
Merge commit '1eb932803037a3c9f98f66aeb80024dfa3c5c743'

* commit '1eb932803037a3c9f98f66aeb80024dfa3c5c743':
  asfenc: add ASF_Reserved_4 as defined in section 10.10 of the ASF spec

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c53b5dda352452e79a9e962cd4c74c813186d9ed'
Michael Niedermayer [Fri, 20 Sep 2013 09:06:09 +0000 (11:06 +0200)]
Merge commit 'c53b5dda352452e79a9e962cd4c74c813186d9ed'

* commit 'c53b5dda352452e79a9e962cd4c74c813186d9ed':
  asfdec: replace magic constant with DATA_HEADER_SIZE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5f408333601a827054335f309defcb246a532b21'
Michael Niedermayer [Fri, 20 Sep 2013 08:56:54 +0000 (10:56 +0200)]
Merge commit '5f408333601a827054335f309defcb246a532b21'

* commit '5f408333601a827054335f309defcb246a532b21':
  asfdec: substract preroll time from marker presentation time

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortmpproto: Add a comment explaining the logic in handle_notify
Martin Storsjö [Thu, 19 Sep 2013 09:48:04 +0000 (12:48 +0300)]
rtmpproto: Add a comment explaining the logic in handle_notify

This explains why the cleanup in 5626f994f was wrong and why
ae0f316a was needed.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavformat/matroskadec: correct spurious keyframe warnings in webm
Monty Montgomery [Wed, 11 Sep 2013 06:00:31 +0000 (02:00 -0400)]
avformat/matroskadec: correct spurious keyframe warnings in webm

Minor change to fix for Trac #1003 to avoid squawking about files
with valid keyframes that aren't marked (as opposed to frames that are
marked as keyframes and aren't).

Change correctly surpresses the spurious warnings, while still complaining
about (and handling) the genuinely broken file attached to bug #1003.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/matroskadec: use av_malloc_array() and check for allocation error
Paul B Mahol [Mon, 16 Sep 2013 18:03:27 +0000 (18:03 +0000)]
avformat/matroskadec: use av_malloc_array() and check for allocation error

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoswscale/swscale_unscaled: fix alpha values for rgb/bgr -> RGB32_1 / BGR32_1
Michael Niedermayer [Thu, 19 Sep 2013 21:09:16 +0000 (23:09 +0200)]
swscale/swscale_unscaled: fix alpha values for rgb/bgr -> RGB32_1 / BGR32_1

Found-by: Justin Ruggles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/frame: suppress "comparison of unsigned expression < 0 is always false" warning
Michael Niedermayer [Thu, 19 Sep 2013 20:46:52 +0000 (22:46 +0200)]
avutil/frame: suppress "comparison of unsigned expression < 0 is always false" warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil: add av_get_colorspace_name()
Michael Niedermayer [Sat, 31 Aug 2013 15:10:10 +0000 (17:10 +0200)]
avutil: add av_get_colorspace_name()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/bmv: remove unused variable
Michael Niedermayer [Thu, 19 Sep 2013 13:25:48 +0000 (15:25 +0200)]
avformat/bmv: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: Support cparser
Luca Barbato [Thu, 12 Sep 2013 18:17:15 +0000 (20:17 +0200)]
build: Support cparser

6 years agor3d: Add more input value validation
Martin Storsjö [Thu, 19 Sep 2013 14:02:36 +0000 (17:02 +0300)]
r3d: Add more input value validation

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agorl2: Avoid a division by zero
Martin Storsjö [Thu, 19 Sep 2013 13:57:47 +0000 (16:57 +0300)]
rl2: Avoid a division by zero

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agowtv: Add more sanity checks for a length read from the file
Martin Storsjö [Thu, 19 Sep 2013 13:55:13 +0000 (16:55 +0300)]
wtv: Add more sanity checks for a length read from the file

Also make sure the existing length check can't overflow.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoyop: Clear all references to the AVBuffer in the local AVPacket
Martin Storsjö [Thu, 19 Sep 2013 13:49:48 +0000 (16:49 +0300)]
yop: Clear all references to the AVBuffer in the local AVPacket

This makes sure that it doesn't try to free an AVBuffer belonging
to an earlier packet when we free the local packet at the end.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agofraps: Make the input buffer size checks more strict
Martin Storsjö [Thu, 19 Sep 2013 13:29:23 +0000 (16:29 +0300)]
fraps: Make the input buffer size checks more strict

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosegafilm: Validate the number of audio channels
Martin Storsjö [Thu, 19 Sep 2013 13:02:29 +0000 (16:02 +0300)]
segafilm: Validate the number of audio channels

This avoids divisions by zero later.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosvq3: Avoid a division by zero
Martin Storsjö [Thu, 19 Sep 2013 12:58:59 +0000 (15:58 +0300)]
svq3: Avoid a division by zero

If the height is zero, the decompression will probably end up
failing due to not fitting into the allocated buffer later
anyway, so this doesn't need any more elaborate check.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoqpeg: Add checks for running out of rows in qpeg_decode_inter
Martin Storsjö [Thu, 19 Sep 2013 12:53:31 +0000 (15:53 +0300)]
qpeg: Add checks for running out of rows in qpeg_decode_inter

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agompegaudiodec: Validate that the number of channels fits at the given offset
Martin Storsjö [Thu, 19 Sep 2013 12:32:02 +0000 (15:32 +0300)]
mpegaudiodec: Validate that the number of channels fits at the given offset

This is similar to the fix in 35cbc98b.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoasvdec: Verify the amount of extradata
Martin Storsjö [Thu, 19 Sep 2013 12:14:56 +0000 (15:14 +0300)]
asvdec: Verify the amount of extradata

The init function reads one byte of extradata.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agomovenc: Use null buffers for measuring the amount of data to be written
Martin Storsjö [Wed, 18 Sep 2013 19:02:17 +0000 (22:02 +0300)]
movenc: Use null buffers for measuring the amount of data to be written

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoaviobuf: Add functions for null buffers
Martin Storsjö [Wed, 18 Sep 2013 18:50:50 +0000 (21:50 +0300)]
aviobuf: Add functions for null buffers

Null buffers are useful for simulating writing to a real buffer
for the sake of measuring how many bytes are written.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavfilter/vf_decimate: add gray16 and yuv440p
Paul B Mahol [Wed, 11 Sep 2013 13:46:33 +0000 (13:46 +0000)]
avfilter/vf_decimate: add gray16 and yuv440p

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoasfenc: mux chapters in ASF files using an ASF "marker" section
Vladimir Pantelic [Thu, 19 Sep 2013 15:50:38 +0000 (17:50 +0200)]
asfenc: mux chapters in ASF files using an ASF "marker" section

ASF markers only have a start time, so we lose the chapter end times,
but that is ASF for you

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoavfilter/vf_decimate: fix crash with gray8
Paul B Mahol [Thu, 19 Sep 2013 17:50:18 +0000 (17:50 +0000)]
avfilter/vf_decimate: fix crash with gray8

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoasfenc: remember send time and offset of the index entries
Vladimir Pantelic [Thu, 19 Sep 2013 15:50:37 +0000 (17:50 +0200)]
asfenc: remember send time and offset of the index entries

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoasfenc: add ASF_Reserved_4 as defined in section 10.10 of the ASF spec
Vladimir Pantelic [Thu, 19 Sep 2013 15:50:36 +0000 (17:50 +0200)]
asfenc: add ASF_Reserved_4 as defined in section 10.10 of the ASF spec

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoasfdec: replace magic constant with DATA_HEADER_SIZE
Vladimir Pantelic [Thu, 19 Sep 2013 15:50:35 +0000 (17:50 +0200)]
asfdec: replace magic constant with DATA_HEADER_SIZE

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoasfdec: substract preroll time from marker presentation time
Vladimir Pantelic [Thu, 19 Sep 2013 15:50:34 +0000 (17:50 +0200)]
asfdec: substract preroll time from marker presentation time

this was forgotten when we changed ASF to not output the preroll time

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agodoc: Add missing hashes and dates to APIChanges
Paul B Mahol [Wed, 18 Sep 2013 21:52:49 +0000 (21:52 +0000)]
doc: Add missing hashes and dates to APIChanges

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/mp: remove mp=qp
Paul B Mahol [Wed, 18 Sep 2013 22:47:47 +0000 (22:47 +0000)]
lavfi/mp: remove mp=qp

The filter does nothing.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavformat/concat: revert one hunk of 20dfab33f5ab61fc51de65192ed239f8b62782a2
Michael Niedermayer [Thu, 19 Sep 2013 12:51:46 +0000 (14:51 +0200)]
avformat/concat: revert one hunk of 20dfab33f5ab61fc51de65192ed239f8b62782a2

The deallocated memory contains resources that need to be freed before it
can be deallocated. The original code was correct.
This also fixes a double free

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/smacker: Check if bufs has been allocated before use
Michael Niedermayer [Thu, 19 Sep 2013 12:20:21 +0000 (14:20 +0200)]
avformat/smacker: Check if bufs has been allocated before use

Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 19 Sep 2013 11:39:03 +0000 (13:39 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rv34: Fix a memory leak on errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'bcbe4f3ceb6ee0210d3a401963518906c8b9b230'
Michael Niedermayer [Thu, 19 Sep 2013 11:33:25 +0000 (13:33 +0200)]
Merge commit 'bcbe4f3ceb6ee0210d3a401963518906c8b9b230'

* commit 'bcbe4f3ceb6ee0210d3a401963518906c8b9b230':
  idroqdec: Make sure a video stream has been allocated before returning packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5372cda67109848d22146289e401669266217e80'
Michael Niedermayer [Thu, 19 Sep 2013 11:07:54 +0000 (13:07 +0200)]
Merge commit '5372cda67109848d22146289e401669266217e80'

* commit '5372cda67109848d22146289e401669266217e80':
  rv10: Validate the dimensions set from the container

This check could be replaced by a width==0||height==0

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