ffmpeg.git
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 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 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>
4 years agodashenc: Use pts for MPD timeline timestamps
Martin Storsjö [Mon, 17 Nov 2014 12:34:46 +0000 (14:34 +0200)]
dashenc: Use pts for MPD timeline timestamps

This should be more correct. This also should give more sensible
switching between video streams with different amount of b-frame
delay.

The current dash.js release (1.2.0) fails to start playback of
such files from the start (if the start pts is > 0), but this has
been fixed in the current git version of dash.js.

Also enable the use of edit lists, so that streams in many cases
start at pts=0.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agodashenc: Use delay_moov
Martin Storsjö [Mon, 3 Nov 2014 19:42:09 +0000 (21:42 +0200)]
dashenc: Use delay_moov

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agomovenc: Get rid of a hack for updating the dvc1 atom
Martin Storsjö [Mon, 29 Dec 2014 11:32:21 +0000 (13:32 +0200)]
movenc: Get rid of a hack for updating the dvc1 atom

Use the more generic approach with the delay_moov flag, instead of
having a update mechanism specific to this one single atom.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agomovenc: Add an option for delaying writing the moov with empty_moov
Martin Storsjö [Mon, 3 Nov 2014 14:09:15 +0000 (16:09 +0200)]
movenc: Add an option for delaying writing the moov with empty_moov

This delays writing the moov until the first fragment is written,
or can be flushed by the caller explicitly when wanted. If the first
sample in all streams is available at this point, we can write
a proper editlist at this point, allowing streams to start at
something else than dts=0. For AC3 and DNXHD, a packet is
needed in order to write the moov header properly.

This isn't added to the normal behaviour for empty_moov, since
the behaviour that ftyp+moov is written during avformat_write_header
would be changed. Callers that split the output stream into header+segments
(either by flushing manually, with the custom_frag flag set, or by
just differentiating between data written during avformat_write_header
and the rest) will need to be adjusted to take this option into use.

For handling streams that start at something else than dts=0, an
alternative would be to use different kinds of heuristics for
guessing the start dts (using AVCodecContext delay or has_b_frames
together with the frame rate), but this is not reliable and doesn't
necessarily work well with stream copy, and wouldn't work for getting
the right initialization data for AC3 or DNXHD either.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agomovenc: Use start_dts/cts instead of cluster[0] for writing edit lists
Martin Storsjö [Mon, 3 Nov 2014 18:34:27 +0000 (20:34 +0200)]
movenc: Use start_dts/cts instead of cluster[0] for writing edit lists

This allows writing edit lists even when track->entry == 0, if
the start times have been set.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agomovenc: Remove an unnecessary condition when flushing fragments
Martin Storsjö [Thu, 18 Dec 2014 21:59:27 +0000 (23:59 +0200)]
movenc: Remove an unnecessary condition when flushing fragments

If fragments == 0 it means we haven't written any moov atom yet.
If the empty_moov flag is set, we already have written an empty moov
atom at startup. Thus, the check for empty_moov is redundant.

This is in preparation for allowing writing the moov atom later,
even when using the empty moov flag.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agomovenc: Factorize writing ftyp and other identification tags to a separate function
Martin Storsjö [Thu, 18 Dec 2014 21:52:42 +0000 (23:52 +0200)]
movenc: Factorize writing ftyp and other identification tags to a separate function

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavutil/camellia: cosmetic fixes
Giorgio Vazzana [Fri, 2 Jan 2015 16:05:30 +0000 (17:05 +0100)]
avutil/camellia: cosmetic fixes

Signed-off-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/camellia: use K[2] instead of *K in generate_round_keys()
Giorgio Vazzana [Fri, 2 Jan 2015 15:57:09 +0000 (16:57 +0100)]
avutil/camellia: use K[2] instead of *K in generate_round_keys()

Additionally, change parameters order.

Signed-off-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/camellia: make LR128() more robust
Giorgio Vazzana [Fri, 2 Jan 2015 15:49:12 +0000 (16:49 +0100)]
avutil/camellia: make LR128() more robust

Signed-off-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/camellia: fix documentation for av_camellia_crypt()
Giorgio Vazzana [Fri, 2 Jan 2015 15:33:17 +0000 (16:33 +0100)]
avutil/camellia: fix documentation for av_camellia_crypt()

Signed-off-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavd/lavfi: allow to extract subcc.
Nicolas George [Thu, 4 Dec 2014 12:37:08 +0000 (13:37 +0100)]
lavd/lavfi: allow to extract subcc.

Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavutil: Added Camellia symmetric block cipher
Supraja Meedinti [Wed, 31 Dec 2014 16:20:18 +0000 (21:50 +0530)]
libavutil: Added Camellia symmetric block cipher

Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Previous version of this patch reviewed-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoChangelog: Add cropdetect non 8bpp
Michael Niedermayer [Thu, 1 Jan 2015 02:33:44 +0000 (03:33 +0100)]
Changelog: Add cropdetect non 8bpp

Suggested-by: Reimar
Previous patch reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mov: reindent after previous commit
Clément Bœsch [Mon, 1 Dec 2014 14:44:10 +0000 (15:44 +0100)]
avformat/mov: reindent after previous commit

4 years agoavformat/mov: move edit list heuristics into mov_build_index()
Clément Bœsch [Wed, 12 Nov 2014 14:42:17 +0000 (15:42 +0100)]
avformat/mov: move edit list heuristics into mov_build_index()

mov_read_elst() is now only responsible from storing the table in a data
structure; this is consistent with other table readers functions.

4 years agoavcodec/mpeg12dec: Check actual aspect ratio instead of aspect_ratio_info
Michael Niedermayer [Fri, 2 Jan 2015 02:18:54 +0000 (03:18 +0100)]
avcodec/mpeg12dec: Check actual aspect ratio instead of aspect_ratio_info

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpeg12dec: Recalculate SAR unconditionally
Michael Niedermayer [Fri, 2 Jan 2015 01:33:34 +0000 (02:33 +0100)]
avcodec/mpeg12dec: Recalculate SAR unconditionally

Fixes Ticket4161

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/mpeg12dec: Move user data debug code out of unrelated if (buf_size > 29)
Michael Niedermayer [Fri, 2 Jan 2015 01:27:18 +0000 (02:27 +0100)]
avcodec/mpeg12dec: Move user data debug code out of unrelated if (buf_size > 29)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/flvdec: remove duplicated line error
Clément Bœsch [Thu, 1 Jan 2015 21:09:21 +0000 (22:09 +0100)]
avformat/flvdec: remove duplicated line error

Fix typo regression since 5c37ffca59e7eb1b8768f237deb35a9936c1a0a5

Found-By: cousin_luigi
4 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Thu, 1 Jan 2015 19:19:51 +0000 (20:19 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: dump format before selecting streams
  ffplay: add support for stream specifiers in -ast, -vst, -sst options
  ffplay: remove unused no_background from videostate
  ffplay: remove flushed state from decoder context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/flvdec: use named identifier instead of literal numbers as return values
Michael Niedermayer [Thu, 1 Jan 2015 18:14:06 +0000 (19:14 +0100)]
avformat/flvdec: use named identifier instead of literal numbers as return values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/flvdec: Increase string array size
Michael Niedermayer [Thu, 1 Jan 2015 17:15:16 +0000 (18:15 +0100)]
avformat/flvdec: Increase string array size

Fixes parsing httphostheader of Scarlatti\,\ Pieter-Jan\ Belder\ -\ Sonata\ K113\ in\ A\ major\ -\ Alle.flv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/flvdec: do not inject dts=0 metadata packets which failed to be parsed into...
Michael Niedermayer [Thu, 1 Jan 2015 17:07:24 +0000 (18:07 +0100)]
avformat/flvdec: do not inject dts=0 metadata packets which failed to be parsed into a new data stream

Such data streams (which then contain no other packets except the faulty one)
confuse some user applications, like VLC
Works around vlcticket 12389

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/flvdec: add several error messages to error conditions
Michael Niedermayer [Thu, 1 Jan 2015 17:03:54 +0000 (18:03 +0100)]
avformat/flvdec: add several error messages to error conditions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffplay: dump format before selecting streams
Marton Balint [Sat, 20 Dec 2014 19:44:39 +0000 (20:44 +0100)]
ffplay: dump format before selecting streams

This helps the user to see the available streams just before the error message
if the stream specifiers do not match.

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoffplay: add support for stream specifiers in -ast, -vst, -sst options
Marton Balint [Sat, 20 Dec 2014 17:18:48 +0000 (18:18 +0100)]
ffplay: add support for stream specifiers in -ast, -vst, -sst options

Also fix the outdated documentation of these options.

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoffplay: remove unused no_background from videostate
Marton Balint [Sat, 8 Nov 2014 15:59:13 +0000 (16:59 +0100)]
ffplay: remove unused no_background from videostate

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoffplay: remove flushed state from decoder context
Marton Balint [Thu, 30 Oct 2014 00:50:22 +0000 (01:50 +0100)]
ffplay: remove flushed state from decoder context

Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoavfilter/vf_idet: Add 9, 12 and 14 bit pixel formats
Michael Niedermayer [Thu, 1 Jan 2015 04:23:06 +0000 (05:23 +0100)]
avfilter/vf_idet: Add 9, 12 and 14 bit pixel formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_idet: Use frame_requested instead of prev
Michael Niedermayer [Thu, 1 Jan 2015 01:30:16 +0000 (02:30 +0100)]
avfilter/vf_idet: Use frame_requested instead of prev

This is more robust if the delay is not constant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/cdxl: Fix integer overflow of image_size
Michael Niedermayer [Wed, 31 Dec 2014 20:41:46 +0000 (21:41 +0100)]
avformat/cdxl: Fix integer overflow of image_size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86/swr: disable pack_8ch functions on msvc/icl x86_32
James Almer [Wed, 31 Dec 2014 19:37:29 +0000 (16:37 -0300)]
x86/swr: disable pack_8ch functions on msvc/icl x86_32

Until a proper fix is committed.

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agox86/swr: add missing alignment check to pack_6ch functions
James Almer [Wed, 31 Dec 2014 05:15:08 +0000 (02:15 -0300)]
x86/swr: add missing alignment check to pack_6ch functions

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>