ffmpeg.git
4 years agoMerge commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f'
Michael Niedermayer [Tue, 6 Jan 2015 23:38:50 +0000 (00:38 +0100)]
Merge commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f'

* commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f':
  movenc: Readd an accidentally removed condition

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8e03ca2fff40ce065ea5a516200e777c96cd785e'
Michael Niedermayer [Tue, 6 Jan 2015 23:29:42 +0000 (00:29 +0100)]
Merge commit '8e03ca2fff40ce065ea5a516200e777c96cd785e'

* commit '8e03ca2fff40ce065ea5a516200e777c96cd785e':
  isom: add 'mp1v' fourcc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1c6183233d56fb27a4a154e7e64ecab98bd877f1'
Michael Niedermayer [Tue, 6 Jan 2015 23:12:52 +0000 (00:12 +0100)]
Merge commit '1c6183233d56fb27a4a154e7e64ecab98bd877f1'

* commit '1c6183233d56fb27a4a154e7e64ecab98bd877f1':
  msmpeg4: check memory allocations and propagate errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907'
Michael Niedermayer [Tue, 6 Jan 2015 23:04:35 +0000 (00:04 +0100)]
Merge commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907'

* commit 'ed97963bdbf3bb17fca4f9ea0aa1a97722dec907':
  ulti: invert the order of parameters of ulti_decode_frame()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4438c256387a5845e5cdc5c14c43f4047b68301b'
Michael Niedermayer [Tue, 6 Jan 2015 23:03:02 +0000 (00:03 +0100)]
Merge commit '4438c256387a5845e5cdc5c14c43f4047b68301b'

* commit '4438c256387a5845e5cdc5c14c43f4047b68301b':
  vf_interlace: remove the warning tag in the message

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '15ea222778caaec0877b3f9938140b707c931d96'
Michael Niedermayer [Tue, 6 Jan 2015 22:50:45 +0000 (23:50 +0100)]
Merge commit '15ea222778caaec0877b3f9938140b707c931d96'

* commit '15ea222778caaec0877b3f9938140b707c931d96':
  vf_interlace: merge FIELD_LOWER check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2'
Michael Niedermayer [Tue, 6 Jan 2015 22:40:11 +0000 (23:40 +0100)]
Merge commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2'

* commit '046f75a970701b4c947d38bfd2186dcc5f2ddae2':
  vf_interlace: also assert for height

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovfilter/vf_tinterlace: Fix issues with linesize and cols
Michael Niedermayer [Tue, 6 Jan 2015 22:20:18 +0000 (23:20 +0100)]
vfilter/vf_tinterlace: Fix issues with linesize and cols

Based on patch by Vittorio Giovara <vittorio.giovara@gmail.com> from 696141e898193311c994b399a8dc60713709092f

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '696141e898193311c994b399a8dc60713709092f'
Michael Niedermayer [Tue, 6 Jan 2015 21:38:11 +0000 (22:38 +0100)]
Merge commit '696141e898193311c994b399a8dc60713709092f'

* commit '696141e898193311c994b399a8dc60713709092f':
  vf_interlace: use image width rather than linesize

Conflicts:
libavfilter/vf_interlace.c

See: f043965cd5145d8540d55c013b0d809b6a874c53
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'fe082998683334e7f573cfe3876810fb80c5249c'
Michael Niedermayer [Tue, 6 Jan 2015 21:33:18 +0000 (22:33 +0100)]
Merge commit 'fe082998683334e7f573cfe3876810fb80c5249c'

* commit 'fe082998683334e7f573cfe3876810fb80c5249c':
  build: Use -Werror=format-security

Conflicts:
configure

See: 97592faa51eacda9a949c4f0ba2a6d7989ef5f3b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '2cef68da69a17ed09c313ba3c3850ec1cc0a80e0'
Michael Niedermayer [Tue, 6 Jan 2015 21:12:53 +0000 (22:12 +0100)]
Merge commit '2cef68da69a17ed09c313ba3c3850ec1cc0a80e0'

* commit '2cef68da69a17ed09c313ba3c3850ec1cc0a80e0':
  vda: error out if decoded CVPixelBuffer is empty

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ffv1enc: Fix incompatible pointer type warning
Michael Niedermayer [Tue, 6 Jan 2015 21:05:13 +0000 (22:05 +0100)]
avcodec/ffv1enc: Fix incompatible pointer type warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0352ff102d62ee94e79e0baaf64d5ad4e66f907b'
Michael Niedermayer [Tue, 6 Jan 2015 21:03:57 +0000 (22:03 +0100)]
Merge commit '0352ff102d62ee94e79e0baaf64d5ad4e66f907b'

* commit '0352ff102d62ee94e79e0baaf64d5ad4e66f907b':
  ffv1: const correctness for encode_rgb_frame()

Conflicts:
libavcodec/ffv1enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'ca09effb01e126b0ac74ff3de70a475423ddee82'
Michael Niedermayer [Tue, 6 Jan 2015 20:54:26 +0000 (21:54 +0100)]
Merge commit 'ca09effb01e126b0ac74ff3de70a475423ddee82'

* commit 'ca09effb01e126b0ac74ff3de70a475423ddee82':
  ffv1: Drop unnecessary casts and const qualifiers to match function signatures

Conflicts:
libavcodec/ffv1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '1dd797e3c9f179f957316a0becbec048b42df8aa'
Michael Niedermayer [Tue, 6 Jan 2015 20:44:08 +0000 (21:44 +0100)]
Merge commit '1dd797e3c9f179f957316a0becbec048b42df8aa'

* commit '1dd797e3c9f179f957316a0becbec048b42df8aa':
  swscale: check memory allocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '07a0c0f0005072d115ace61e60f46be68582cc3a'
Michael Niedermayer [Tue, 6 Jan 2015 20:37:33 +0000 (21:37 +0100)]
Merge commit '07a0c0f0005072d115ace61e60f46be68582cc3a'

* commit '07a0c0f0005072d115ace61e60f46be68582cc3a':
  opt: check memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotools/ismindex.c: Use av_realloc_array()
Michael Niedermayer [Tue, 6 Jan 2015 20:08:20 +0000 (21:08 +0100)]
tools/ismindex.c: Use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotools/ismindex: Keep count fields consistent with arrays in case of errors
Michael Niedermayer [Tue, 6 Jan 2015 20:07:50 +0000 (21:07 +0100)]
tools/ismindex: Keep count fields consistent with arrays in case of errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomovenc: Readd an accidentally removed condition
Martin Storsjö [Mon, 5 Jan 2015 13:07:01 +0000 (15:07 +0200)]
movenc: Readd an accidentally removed condition

This was removed accidentally as part of 847bf598. This could cause
groundless warning logging.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agocmdutils.c: Use av_realloc_array()
Michael Niedermayer [Tue, 6 Jan 2015 16:52:54 +0000 (17:52 +0100)]
cmdutils.c: Use av_realloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoisom: add 'mp1v' fourcc
Justin Ruggles [Tue, 4 Feb 2014 20:40:32 +0000 (15:40 -0500)]
isom: add 'mp1v' fourcc

As referenced in the CoreMedia API docs.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agomsmpeg4: check memory allocations and propagate errors
Vittorio Giovara [Wed, 17 Dec 2014 15:02:10 +0000 (16:02 +0100)]
msmpeg4: check memory allocations and propagate errors

Bug-Id: CID 1257781

4 years agoulti: invert the order of parameters of ulti_decode_frame()
Vittorio Giovara [Thu, 18 Dec 2014 19:26:58 +0000 (20:26 +0100)]
ulti: invert the order of parameters of ulti_decode_frame()

This is the order that the caller uses in the rest of the file.
Variables are modified to reflect the order above too and their
initialization is merged with their declarationt. No behavioral
change.

Bug-Id: CID 732286

4 years agoavformat/id3v2: support USLT tags
wm4 [Mon, 5 Jan 2015 17:56:20 +0000 (18:56 +0100)]
avformat/id3v2: support USLT tags

I think this turned out pretty terrible. There's no good way to add new
custom tags that write to AVFormatContext->metadata.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agocmdutils: Use 64bit for file size/offset related variable in cmdutils_read_file()
Michael Niedermayer [Tue, 6 Jan 2015 12:12:22 +0000 (13:12 +0100)]
cmdutils: Use 64bit for file size/offset related variable in cmdutils_read_file()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: Clear pointer in ff_alloc_extradata() to avoid leaving a stale pointe...
Michael Niedermayer [Tue, 6 Jan 2015 11:53:53 +0000 (12:53 +0100)]
avformat/utils: Clear pointer in ff_alloc_extradata() to avoid leaving a stale pointer in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/buffer: use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Tue, 6 Jan 2015 11:53:25 +0000 (12:53 +0100)]
avfilter/buffer: use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/hlsproto: Use av_freep, to avoid leaving stale pointers in memory
Michael Niedermayer [Tue, 6 Jan 2015 11:52:55 +0000 (12:52 +0100)]
avformat/hlsproto: Use av_freep, to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/matroskadec: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Tue, 6 Jan 2015 11:48:38 +0000 (12:48 +0100)]
avformat/matroskadec: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Tue, 6 Jan 2015 11:45:25 +0000 (12:45 +0100)]
avformat/mov: use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: Clear array to prevent potential out of array read from av_dlog()
Michael Niedermayer [Tue, 6 Jan 2015 04:54:29 +0000 (05:54 +0100)]
avformat/mov: Clear array to prevent potential out of array read from av_dlog()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavfi: check av_strdup() return value
Paul B Mahol [Tue, 6 Jan 2015 09:42:59 +0000 (09:42 +0000)]
lavfi: check av_strdup() return value

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agomov: Fix negative size calculation in mov_read_default().
Dale Curtis [Tue, 6 Jan 2015 00:34:17 +0000 (16:34 -0800)]
mov: Fix negative size calculation in mov_read_default().

The previous code assumed if an atom was marked with a 64-bit
size extension, it actually had that data available. The new
code verfies there's enough data in the atom for this to be
done.

Failure to verify causes total_size > atom.size which will
result in negative size calculations later on.

Found-by: Paul Mehta <paul@paulmehta.com>
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: fix integer overflow in mov_read_udta_string()
Michael Niedermayer [Tue, 6 Jan 2015 03:29:10 +0000 (04:29 +0100)]
avformat/mov: fix integer overflow in mov_read_udta_string()

Found-by: Paul Mehta <paul@paulmehta.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomov: Fix overflow and error handling in read_tfra().
Dale Curtis [Tue, 6 Jan 2015 03:00:43 +0000 (04:00 +0100)]
mov: Fix overflow and error handling in read_tfra().

Under abnormal conditions the item_count may exceed the max
allocation size on 32-bit systems, this causes the allocated
size to overflow and become too small for the given count.

Additionally, if av_reallocp() fails its allocation, the
fragment_index_count is not correctly decremented.

Ensuring further havoc may be wrought, the error code for
read_tfra() is not checked upon return.

Found-by: Paul Mehta <paul@paulmehta.com>
positive return code and use of _array functions by commiter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_idet: Add analyze_interlaced_flag mode
Michael Niedermayer [Thu, 1 Jan 2015 01:35:39 +0000 (02:35 +0100)]
avfilter/vf_idet: Add analyze_interlaced_flag mode

This should allow us to insert idet before scale and let scale have interl=-1 as default in that case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_yadif: detect telecine content
Michael Niedermayer [Mon, 5 Jan 2015 22:55:59 +0000 (23:55 +0100)]
avfilter/vf_yadif: detect telecine content

Fixes: yadif with interlaced_flag_switch.mpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/id3v1: strip trailing whitespace
wm4 [Mon, 5 Jan 2015 17:56:19 +0000 (18:56 +0100)]
avformat/id3v1: strip trailing whitespace

ID3v1 fields have a fixed size, and they are padded either with zeros,
or with spaces. Handle the latter case, instead of putting strings with
trailing spaces into the AVDictionary.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86/flacdsp: remove unneeded ifdeffery
James Almer [Mon, 29 Dec 2014 19:44:03 +0000 (16:44 -0300)]
x86/flacdsp: remove unneeded ifdeffery

x86inc can translate r*m into a register or stack on its own

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavformat/dvbsub: increase probe score
Michael Niedermayer [Mon, 5 Jan 2015 15:28:25 +0000 (16:28 +0100)]
avformat/dvbsub: increase probe score

Ive not found a single false positive after some moderate testing with
probetest

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/dvbsub: fix indent after previous commit
Michael Niedermayer [Mon, 5 Jan 2015 15:22:26 +0000 (16:22 +0100)]
avformat/dvbsub: fix indent after previous commit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/dvbsub: check for 0xf0 earlier in probe, 30% faster
Michael Niedermayer [Mon, 5 Jan 2015 15:21:42 +0000 (16:21 +0100)]
avformat/dvbsub: check for 0xf0 earlier in probe, 30% faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'origin/master'
Michael Niedermayer [Mon, 5 Jan 2015 14:55:40 +0000 (15:55 +0100)]
Merge remote-tracking branch 'origin/master'

* origin/master:
  libavfilter/vf_blend: do not unconditionally compile both filters

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovf_interlace: remove the warning tag in the message
Vittorio Giovara [Tue, 2 Dec 2014 14:58:42 +0000 (14:58 +0000)]
vf_interlace: remove the warning tag in the message

The log level is already a warning.

4 years agovf_interlace: merge FIELD_LOWER check
Vittorio Giovara [Tue, 2 Dec 2014 14:58:41 +0000 (14:58 +0000)]
vf_interlace: merge FIELD_LOWER check

4 years agovf_interlace: also assert for height
Vittorio Giovara [Tue, 2 Dec 2014 14:58:39 +0000 (14:58 +0000)]
vf_interlace: also assert for height

4 years agovf_interlace: use image width rather than linesize
Vittorio Giovara [Tue, 2 Dec 2014 14:58:38 +0000 (14:58 +0000)]
vf_interlace: use image width rather than linesize

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

4 years agobuild: Use -Werror=format-security
Agostino Sarubbo [Sun, 21 Dec 2014 13:38:57 +0000 (14:38 +0100)]
build: Use -Werror=format-security

Reduce the chance of introducing a class of bugs quite hard to track.

4 years agovda: error out if decoded CVPixelBuffer is empty
Stefano Pigozzi [Mon, 29 Dec 2014 20:28:50 +0000 (21:28 +0100)]
vda: error out if decoded CVPixelBuffer is empty

On some video samples, VDA silently fails to decode frames and returns
kVDADecoderNoErr. Error out in these cases to avoid producing AVFrames with
empty planes.

Signed-off-by: Stefano Pigozzi <stefano.pigozzi@gmail.com>
4 years agoffv1: const correctness for encode_rgb_frame()
Diego Biurrun [Thu, 18 Dec 2014 19:07:29 +0000 (20:07 +0100)]
ffv1: const correctness for encode_rgb_frame()

libavcodec/ffv1enc.c:922:53: warning: passing argument 5 of ‘encode_rgb_frame’ discards ‘const’ qualifier from pointer target type

4 years agoffv1: Drop unnecessary casts and const qualifiers to match function signatures
Diego Biurrun [Thu, 18 Dec 2014 19:07:28 +0000 (20:07 +0100)]
ffv1: Drop unnecessary casts and const qualifiers to match function signatures

libavcodec/ffv1dec.c:898:36: warning: cast discards ‘const’ qualifier from pointer target type

4 years agoswscale: check memory allocations
Vittorio Giovara [Wed, 17 Dec 2014 15:02:07 +0000 (16:02 +0100)]
swscale: check memory allocations

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

4 years agolibavfilter/vf_blend: do not unconditionally compile both filters
Paul B Mahol [Sun, 4 Jan 2015 12:27:56 +0000 (12:27 +0000)]
libavfilter/vf_blend: do not unconditionally compile both filters

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoopt: check memory allocation
Vittorio Giovara [Thu, 18 Dec 2014 19:26:57 +0000 (20:26 +0100)]
opt: check memory allocation

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

4 years agoavcodec/dvdsubdec: fix out of bounds accesses
wm4 [Mon, 5 Jan 2015 03:45:26 +0000 (04:45 +0100)]
avcodec/dvdsubdec: fix out of bounds accesses

The code blindly trusted buffer offsets read from the file in the RLE
decoder. Explicitly check the offset. Also error out on other RLE
decoding errors.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/ffmpeg: mention both ffpreset/avpreset in documentation, remove superfluous example
Werner Robitza [Fri, 2 Jan 2015 10:11:48 +0000 (11:11 +0100)]
doc/ffmpeg: mention both ffpreset/avpreset in documentation, remove superfluous example

ffmpeg looks for both .ffpreset and .avpreset files depending on whether the
-[avsf]pre or -pre option is used. Added two sections for each type of preset
including the rules according to which files are searched.

(Notably, the lookup order is swapped for avpreset files, because it first
looks for <codec>_<arg>.avpreset and then for <arg>.avpreset.)

This removes the section explaining -pre only, which was under "Examples",
where it did not really make sense.

Signed-off-by: Werner Robitza <werner.robitza@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '46808fdf04ab113df374157b90b506eb3110daf2'
Michael Niedermayer [Mon, 5 Jan 2015 01:45:29 +0000 (02:45 +0100)]
Merge commit '46808fdf04ab113df374157b90b506eb3110daf2'

* commit '46808fdf04ab113df374157b90b506eb3110daf2':
  movenc: Enable editlists by default if delay_moov is enabled

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '9f810a9b374e0ff8e2a19fd8a7347afe2933e229'
Michael Niedermayer [Mon, 5 Jan 2015 01:33:55 +0000 (02:33 +0100)]
Merge commit '9f810a9b374e0ff8e2a19fd8a7347afe2933e229'

* commit '9f810a9b374e0ff8e2a19fd8a7347afe2933e229':
  libavformat: Check for malloc failures in avformat_new_stream

See: a66893ac949864352b36b39e48c4cd72bbd81e54
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c4aa0f865fb2c3b28a309d1bb27fd1c24b75ba28'
Michael Niedermayer [Mon, 5 Jan 2015 01:26:37 +0000 (02:26 +0100)]
Merge commit 'c4aa0f865fb2c3b28a309d1bb27fd1c24b75ba28'

* commit 'c4aa0f865fb2c3b28a309d1bb27fd1c24b75ba28':
  libavformat: Remove a misleading/incorrect comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f4d4e66a24a5c9497a5b6d3c089ac58089a87428'
Michael Niedermayer [Mon, 5 Jan 2015 01:19:47 +0000 (02:19 +0100)]
Merge commit 'f4d4e66a24a5c9497a5b6d3c089ac58089a87428'

* commit 'f4d4e66a24a5c9497a5b6d3c089ac58089a87428':
  configure: Remap -L to -libpath for msvc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3e160652219ff4da433f5672ae1e5f4956abb815'
Michael Niedermayer [Mon, 5 Jan 2015 01:10:17 +0000 (02:10 +0100)]
Merge commit '3e160652219ff4da433f5672ae1e5f4956abb815'

* commit '3e160652219ff4da433f5672ae1e5f4956abb815':
  cmdutils: update copyright year to 2015.

Conflicts:
cmdutils.c

See: b8db25a3338b67186837c49580fe538d63dd73c7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/aiffdec: only read codec tag when there is space in header
Peter Ross [Sun, 4 Jan 2015 21:44:06 +0000 (08:44 +1100)]
avformat/aiffdec: only read codec tag when there is space in header

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/utils: add dvbsub to set_codec_from_probe_data()
Michael Niedermayer [Sun, 4 Jan 2015 22:21:54 +0000 (23:21 +0100)]
avformat/utils: add dvbsub to set_codec_from_probe_data()

Fixes part of ticket 4221

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat: add dvbsub demuxer
Michael Niedermayer [Sun, 4 Jan 2015 22:20:52 +0000 (23:20 +0100)]
avformat: add dvbsub demuxer

This is needed for probing some dvbsub streams in mpegts

Fixes part of ticket4221

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rawdec: Add FF_DEF_RAWSUB_DEMUXER
Michael Niedermayer [Sun, 4 Jan 2015 22:19:49 +0000 (23:19 +0100)]
avformat/rawdec: Add FF_DEF_RAWSUB_DEMUXER

This is similar to the corresponding audio and video macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/rawdec: Make ff_raw_data_read_header() non static
Michael Niedermayer [Sun, 4 Jan 2015 22:18:43 +0000 (23:18 +0100)]
avformat/rawdec: Make ff_raw_data_read_header() non static

This is similar to the raw video read header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/flvenc: omit more metadata elements with specific meaning
Michael Niedermayer [Sat, 3 Jan 2015 22:03:55 +0000 (23:03 +0100)]
avformat/flvenc: omit more metadata elements with specific meaning

Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFactorize avpriv_mirror() out
Michael Niedermayer [Sun, 4 Jan 2015 03:15:01 +0000 (04:15 +0100)]
Factorize avpriv_mirror() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_sab: fix filtering tiny images
Michael Niedermayer [Sun, 4 Jan 2015 00:03:26 +0000 (01:03 +0100)]
avfilter/vf_sab: fix filtering tiny images

Fixes out of array reads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomovenc: Enable editlists by default if delay_moov is enabled
Martin Storsjö [Fri, 2 Jan 2015 23:44:38 +0000 (01:44 +0200)]
movenc: Enable editlists by default if delay_moov is enabled

Being able to write editlists properly is one of the main points
in the delay_moov flag.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agolibavformat: Check for malloc failures in avformat_new_stream
Martin Storsjö [Sat, 3 Jan 2015 19:27:21 +0000 (21:27 +0200)]
libavformat: Check for malloc failures in avformat_new_stream

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agolibavformat: Remove a misleading/incorrect comment
Martin Storsjö [Sat, 3 Jan 2015 19:22:31 +0000 (21:22 +0200)]
libavformat: Remove a misleading/incorrect comment

This comment can be traced back to the initial commit from 2001,
and it seemed to be misleading/incorect already back then. (It
was used for normal, non-raw file formats already then.)

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoconfigure: Remap -L to -libpath for msvc
Martin Storsjö [Fri, 2 Jan 2015 21:29:27 +0000 (23:29 +0200)]
configure: Remap -L to -libpath for msvc

This allows using libraries that are detected via pkg-config with
msvc. (The libraries themselves may have to be built with MSVC
though.)

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agocmdutils: update copyright year to 2015.
Johan Andersson [Sat, 3 Jan 2015 16:31:36 +0000 (17:31 +0100)]
cmdutils: update copyright year to 2015.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoffserver: reindent rtsp_cmd_setup()
Reynaldo H. Verdejo Pinochet [Sat, 3 Jan 2015 23:17:28 +0000 (20:17 -0300)]
ffserver: reindent rtsp_cmd_setup()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: reflow rtsp_cmd_setup()
Reynaldo H. Verdejo Pinochet [Sat, 3 Jan 2015 23:12:15 +0000 (20:12 -0300)]
ffserver: reflow rtsp_cmd_setup()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: drop redundant else clause
Reynaldo H. Verdejo Pinochet [Sat, 3 Jan 2015 23:06:19 +0000 (20:06 -0300)]
ffserver: drop redundant else clause

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: reindent compute_status()
Reynaldo H. Verdejo Pinochet [Sat, 3 Jan 2015 02:01:10 +0000 (23:01 -0300)]
ffserver: reindent compute_status()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: reflow compute_status()
Reynaldo H. Verdejo Pinochet [Sat, 3 Jan 2015 01:30:05 +0000 (22:30 -0300)]
ffserver: reflow compute_status()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoavcodec/libxvid: check for av_malloc*() failures
Michael Niedermayer [Sat, 3 Jan 2015 22:42:34 +0000 (23:42 +0100)]
avcodec/libxvid: check for av_malloc*() failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ljpegenc: Check for av_malloc_array() failure
Michael Niedermayer [Sat, 3 Jan 2015 20:25:26 +0000 (21:25 +0100)]
avcodec/ljpegenc: Check for av_malloc_array() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/westwood_vqa: Remove unneeded cast
Michael Niedermayer [Sat, 3 Jan 2015 20:03:44 +0000 (21:03 +0100)]
avformat/westwood_vqa: Remove unneeded cast

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/movenc: fix DELAY_MOOV
Michael Niedermayer [Sat, 3 Jan 2015 16:24:55 +0000 (17:24 +0100)]
avformat/movenc: fix DELAY_MOOV

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotests/regression-funcs: Remove hardcoded threads 1
Michael Niedermayer [Tue, 23 Dec 2014 02:34:50 +0000 (03:34 +0100)]
tests/regression-funcs: Remove hardcoded threads 1

The tests which use encoders which either use slices or store the encoder thread count
keep a hardcoded value of 1

This will help test more threading code like in filters

Found-by: ubitux
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f2ad1495f23376ce61542967f4fc14205f284d40'
Michael Niedermayer [Sat, 3 Jan 2015 12:24:52 +0000 (13:24 +0100)]
Merge commit 'f2ad1495f23376ce61542967f4fc14205f284d40'

* commit 'f2ad1495f23376ce61542967f4fc14205f284d40':
  avisynth: Use RTLD_LOCAL instead of RTLD_GLOBAL

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agobuild: require libxcb >= 1.4
Clément Bœsch [Sat, 3 Jan 2015 08:52:32 +0000 (09:52 +0100)]
build: require libxcb >= 1.4

Fixes Ticket #4139

4 years agoMerge commit '470c9db11ff2c3249e995e7ba68e87bb81bf778c'
Michael Niedermayer [Sat, 3 Jan 2015 04:17:19 +0000 (05:17 +0100)]
Merge commit '470c9db11ff2c3249e995e7ba68e87bb81bf778c'

* commit '470c9db11ff2c3249e995e7ba68e87bb81bf778c':
  sidxindex: Remove parsing that isn't necessary any longer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: bump year
James Almer [Sat, 3 Jan 2015 04:40:02 +0000 (01:40 -0300)]
configure: bump year

Happy new year!

4 years agoMerge commit '5cf6bda6e2eae496e8eb2bb06c96852d59a58b8a'
Michael Niedermayer [Sat, 3 Jan 2015 03:51:40 +0000 (04:51 +0100)]
Merge commit '5cf6bda6e2eae496e8eb2bb06c96852d59a58b8a'

* commit '5cf6bda6e2eae496e8eb2bb06c96852d59a58b8a':
  sidxindex: Don't adjust the Period start time depending on the track start time

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '7a1a63e34fa46af18311c2493fdaec9a93bdb750'
Michael Niedermayer [Sat, 3 Jan 2015 03:26:05 +0000 (04:26 +0100)]
Merge commit '7a1a63e34fa46af18311c2493fdaec9a93bdb750'

* commit '7a1a63e34fa46af18311c2493fdaec9a93bdb750':
  dashenc: Use pts for MPD timeline timestamps

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c5e7ea13d2d4da0c5da91973a547afff6fe9e011'
Michael Niedermayer [Sat, 3 Jan 2015 03:08:04 +0000 (04:08 +0100)]
Merge commit 'c5e7ea13d2d4da0c5da91973a547afff6fe9e011'

* commit 'c5e7ea13d2d4da0c5da91973a547afff6fe9e011':
  dashenc: Use delay_moov

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b3b0b35db2f3b61bf2f0f4fa85f5b6267d83c8fe'
Michael Niedermayer [Sat, 3 Jan 2015 03:01:29 +0000 (04:01 +0100)]
Merge commit 'b3b0b35db2f3b61bf2f0f4fa85f5b6267d83c8fe'

* commit 'b3b0b35db2f3b61bf2f0f4fa85f5b6267d83c8fe':
  movenc: Get rid of a hack for updating the dvc1 atom

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b'
Michael Niedermayer [Sat, 3 Jan 2015 02:13:16 +0000 (03:13 +0100)]
Merge commit '847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b'

* commit '847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b':
  movenc: Add an option for delaying writing the moov with empty_moov

Conflicts:
libavformat/movenc.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/movenc: Use cluster timestamps when available in edts
Michael Niedermayer [Sat, 3 Jan 2015 01:37:18 +0000 (02:37 +0100)]
avformat/movenc: Use cluster timestamps when available in edts

Also print both if they differ

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c725faebda9a516766d94c33b07972ab0f70cf93'
Michael Niedermayer [Sat, 3 Jan 2015 00:38:58 +0000 (01:38 +0100)]
Merge commit 'c725faebda9a516766d94c33b07972ab0f70cf93'

* commit 'c725faebda9a516766d94c33b07972ab0f70cf93':
  movenc: Use start_dts/cts instead of cluster[0] for writing edit lists

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavisynth: Use RTLD_LOCAL instead of RTLD_GLOBAL
Martin Storsjö [Wed, 31 Dec 2014 22:58:06 +0000 (00:58 +0200)]
avisynth: Use RTLD_LOCAL instead of RTLD_GLOBAL

There shouldn't be any need to add the loaded libraries to the global
symbol namespace.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoMerge commit '724cbea7193945fe5a5b4dea8ede344803572844'
Michael Niedermayer [Sat, 3 Jan 2015 00:25:17 +0000 (01:25 +0100)]
Merge commit '724cbea7193945fe5a5b4dea8ede344803572844'

* commit '724cbea7193945fe5a5b4dea8ede344803572844':
  movenc: Remove an unnecessary condition when flushing fragments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '355d01a1bf55297b1d1f04e4bfbf0ddc93b6247e'
Michael Niedermayer [Sat, 3 Jan 2015 00:18:54 +0000 (01:18 +0100)]
Merge commit '355d01a1bf55297b1d1f04e4bfbf0ddc93b6247e'

* commit '355d01a1bf55297b1d1f04e4bfbf0ddc93b6247e':
  movenc: Factorize writing ftyp and other identification tags to a separate function

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agosidxindex: Remove parsing that isn't necessary any longer
Martin Storsjö [Fri, 28 Nov 2014 07:42:53 +0000 (09:42 +0200)]
sidxindex: Remove parsing that isn't necessary any longer

When we don't adjust the Period start time, we don't need to
parse the earliest_presentation_time from the sidx boxes either.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agosidxindex: Don't adjust the Period start time depending on the track start time
Martin Storsjö [Fri, 28 Nov 2014 07:40:31 +0000 (09:40 +0200)]
sidxindex: Don't adjust the Period start time depending on the track start time

This was only necessary to get playback to start with dash.js 1.2.0,
it has been fixed in the git version.

The previous behaviour was incorrect - the Period's start time
is irrespective of the actual first timestamp of the contents
within the period. The Period start time only says when, within the
global timeline, this particular piece should start to be played
back.

Signed-off-by: Martin Storsjö <martin@martin.st>