ffmpeg.git
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 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>
4 years agoavcodec/loco: check the init_get_bits8() return code
Michael Niedermayer [Wed, 31 Dec 2014 14:12:58 +0000 (15:12 +0100)]
avcodec/loco: check the init_get_bits8() return code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/loco: use enum for mode variable
Michael Niedermayer [Wed, 31 Dec 2014 14:10:25 +0000 (15:10 +0100)]
avcodec/loco: use enum for mode variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/filters: document bit-depth independent cropdetect limit
Michael Niedermayer [Wed, 31 Dec 2014 02:01:19 +0000 (03:01 +0100)]
doc/filters: document bit-depth independent cropdetect limit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/loco: Support LOCO reference encoder with odd width
Michael Niedermayer [Wed, 31 Dec 2014 01:41:01 +0000 (02:41 +0100)]
avcodec/loco: Support LOCO reference encoder with odd width

Fixes Ticket1221

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86/swr: add SSE2/AVX pack_8ch functions
James Almer [Tue, 30 Dec 2014 21:16:37 +0000 (18:16 -0300)]
x86/swr: add SSE2/AVX pack_8ch functions

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavfilter/vf_cropdetect: adjust Default threshold based on bit depth
Michael Niedermayer [Tue, 30 Dec 2014 20:02:34 +0000 (21:02 +0100)]
avfilter/vf_cropdetect: adjust Default threshold based on bit depth

Also allow specifying thresholds that are bit depth independant

Previous version reviewed by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_yadif: add >8bit planar rgb formats
Michael Niedermayer [Tue, 30 Dec 2014 21:52:45 +0000 (22:52 +0100)]
avfilter/vf_yadif: add >8bit planar rgb formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffprobe: Support extracting the number of reference frames
Michael Niedermayer [Mon, 29 Dec 2014 11:23:02 +0000 (12:23 +0100)]
ffprobe: Support extracting the number of reference frames

Fixes Ticket3141

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_uspp: clear AVPacket to not leave uninitialized memory
Michael Niedermayer [Tue, 30 Dec 2014 14:07:14 +0000 (15:07 +0100)]
avfilter/vf_uspp: clear AVPacket to not leave uninitialized memory

Fixes CID1260707

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofate: add a fate-filter-framepack rule
Clément Bœsch [Tue, 30 Dec 2014 13:28:54 +0000 (14:28 +0100)]
fate: add a fate-filter-framepack rule

4 years agoavfilter/framepack: use FF_CEIL_RSHIFT()
Clément Bœsch [Tue, 30 Dec 2014 13:25:41 +0000 (14:25 +0100)]
avfilter/framepack: use FF_CEIL_RSHIFT()

4 years agoavfilter/vf_cropdetect: extend limit to cover 16bit pixel formats
Michael Niedermayer [Tue, 30 Dec 2014 04:33:43 +0000 (05:33 +0100)]
avfilter/vf_cropdetect: extend limit to cover 16bit pixel formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_cropdetect: fix ; typos
Michael Niedermayer [Tue, 30 Dec 2014 04:32:14 +0000 (05:32 +0100)]
avfilter/vf_cropdetect: fix ; typos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_cropdetect: support 9-16bit planar formats
Michael Niedermayer [Tue, 30 Dec 2014 04:29:27 +0000 (05:29 +0100)]
avfilter/vf_cropdetect: support 9-16bit planar formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_cropdetect: Unroll 3 & 4 bytes per sample loop
Michael Niedermayer [Tue, 30 Dec 2014 01:35:32 +0000 (02:35 +0100)]
avfilter/vf_cropdetect: Unroll 3 & 4 bytes per sample loop

19484 -> 10266 decicycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_cropdetect: Unroll 1byte per sample loop
Michael Niedermayer [Tue, 30 Dec 2014 01:31:10 +0000 (02:31 +0100)]
avfilter/vf_cropdetect: Unroll 1byte per sample loop

12807 -> 6336 decicycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_cropdetect: add RGB & RGBA support
Michael Niedermayer [Tue, 30 Dec 2014 01:19:05 +0000 (02:19 +0100)]
avfilter/vf_cropdetect: add RGB & RGBA support

These where already supported in the code but not listed in the supported
pixel formats.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8d54bacb789c7d37ca3cf48d9ac13083ad0c1ba7'
Michael Niedermayer [Tue, 30 Dec 2014 00:57:17 +0000 (01:57 +0100)]
Merge commit '8d54bacb789c7d37ca3cf48d9ac13083ad0c1ba7'

* commit '8d54bacb789c7d37ca3cf48d9ac13083ad0c1ba7':
  dashenc: Remove some stray double spaces

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b91a5757fcbf723da99b05b298a6f820271dbc2b'
Michael Niedermayer [Tue, 30 Dec 2014 00:50:17 +0000 (01:50 +0100)]
Merge commit 'b91a5757fcbf723da99b05b298a6f820271dbc2b'

* commit 'b91a5757fcbf723da99b05b298a6f820271dbc2b':
  dashenc: Fix writing of timelines that don't start at t=0

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '50036c30df83b609bc5a95276f1287f8b9b8bdd6'
Michael Niedermayer [Tue, 30 Dec 2014 00:44:08 +0000 (01:44 +0100)]
Merge commit '50036c30df83b609bc5a95276f1287f8b9b8bdd6'

* commit '50036c30df83b609bc5a95276f1287f8b9b8bdd6':
  fate: Use bitexact conversions in the dpxparser test

Conflicts:
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFix decoding for little endian Aja Kona 10-bit RGB.
Carl Eugen Hoyos [Mon, 29 Dec 2014 21:47:04 +0000 (22:47 +0100)]
Fix decoding for little endian Aja Kona 10-bit RGB.

The little endian fourcc is r10k, big endian uses R10k.
Reported and analyzed by Jason Freets, jasonslife hotmail

4 years agodashenc: Remove some stray double spaces
Martin Storsjö [Mon, 29 Dec 2014 12:57:05 +0000 (14:57 +0200)]
dashenc: Remove some stray double spaces

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agodashenc: Fix writing of timelines that don't start at t=0
Martin Storsjö [Mon, 29 Dec 2014 13:39:23 +0000 (15:39 +0200)]
dashenc: Fix writing of timelines that don't start at t=0

When writing an explicit time, reset the cur_time variable to this
value as well. This avoids writing excessive time attributes for each
segment in the timeline, as long as the segments are continuous.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agofate: Use bitexact conversions in the dpxparser test
Martin Storsjö [Sun, 28 Dec 2014 22:20:08 +0000 (00:20 +0200)]
fate: Use bitexact conversions in the dpxparser test

This fixes fate on e.g. ppc.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agolibavformat/cdxl: fix duration in case of overflow
Michael Niedermayer [Mon, 29 Dec 2014 19:53:56 +0000 (20:53 +0100)]
libavformat/cdxl: fix duration in case of overflow

Fixes integer overflow
Fixes CID1260706

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/rational: Check that av_reduce() returns values within the requested max
Michael Niedermayer [Mon, 29 Dec 2014 14:52:34 +0000 (15:52 +0100)]
avutil/rational: Check that av_reduce() returns values within the requested max

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ituh263enc: Check den==0 in ff_h263_aspect_to_info()
Michael Niedermayer [Mon, 29 Dec 2014 14:51:36 +0000 (15:51 +0100)]
avcodec/ituh263enc: Check den==0 in ff_h263_aspect_to_info()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/ffwavesynth: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Mon, 29 Dec 2014 13:06:26 +0000 (14:06 +0100)]
avcodec/ffwavesynth: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mux: 2 subtitle packets could have the same DTS
Michael Niedermayer [Fri, 9 May 2014 14:02:30 +0000 (16:02 +0200)]
avformat/mux: 2 subtitle packets could have the same DTS

Fixes Ticket3514

See: ETSI EN 300 743 V1.3.1 (2006-11)
"In summary, all of the segments of a single display set shall be carried in one (or more) PES packets that have the same
 PTS value."
with PTS = DTS and remuxing of such a stream it is to be expected that sometimes
multiple packets would have the same DTS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibavformat/segment.c: Add strftime expansion for segment filename templates
Pedro E. M. Brito [Sun, 28 Dec 2014 07:35:34 +0000 (05:35 -0200)]
libavformat/segment.c: Add strftime expansion for segment filename templates

Allows expansion of the filename template with strftime() with the option
-strftime 1 (disabled by default). This allows segments to be named by time of
creation, adding some flexibility.

Fixes Ticket 4104 (add strftime to segment muxer)

Signed-off-by: Pedro E. M. Brito <pedroembrito@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFix R10k blue channel output.
Carl Eugen Hoyos [Sun, 28 Dec 2014 20:07:56 +0000 (21:07 +0100)]
Fix R10k blue channel output.

Makes R10k -> gbrp10 ffv1 -> R10k roundtrip bit-identical.

4 years agodoc/ffmpeg.texi: document the new -sdp_file option
Simon Thelen [Sun, 28 Dec 2014 13:51:15 +0000 (14:51 +0100)]
doc/ffmpeg.texi: document the new -sdp_file option

Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavdevice/dshow: Remove unneeded NULL checks
Michael Niedermayer [Sun, 28 Dec 2014 17:17:12 +0000 (18:17 +0100)]
avdevice/dshow: Remove unneeded NULL checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavdevice/dshow: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Sun, 28 Dec 2014 17:16:37 +0000 (18:16 +0100)]
avdevice/dshow: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavdevice/dv1394: Use av_freep() to avoid leaving stale pointers in memory
Michael Niedermayer [Sun, 28 Dec 2014 17:16:02 +0000 (18:16 +0100)]
avdevice/dv1394: Use av_freep() to avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_cropdetect: add max_outliers parameter
Michael Niedermayer [Sat, 27 Dec 2014 03:27:07 +0000 (04:27 +0100)]
avfilter/vf_cropdetect: add max_outliers parameter

Fixes Ticket3030

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: Use av_freep(), avoid leaving stale pointers in memory
Michael Niedermayer [Sun, 28 Dec 2014 01:56:02 +0000 (02:56 +0100)]
ffmpeg: Use av_freep(), avoid leaving stale pointers in memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: add sdp_file option
Simon Thelen [Thu, 25 Dec 2014 21:56:06 +0000 (22:56 +0100)]
ffmpeg: add sdp_file option

Allow printing of sdp information to a file specified by -sdp_file
This allows users to print sdp information when at least one of the
outputs isn't an rtp stream.

Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vdpau: fix assertion failure and < vs > error
Michael Niedermayer [Sun, 28 Dec 2014 00:47:05 +0000 (01:47 +0100)]
avcodec/vdpau: fix assertion failure and < vs > error

Fixes Ticket4211

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'rbultje/vp9-32bit-lpf'
Michael Niedermayer [Sat, 27 Dec 2014 22:17:21 +0000 (23:17 +0100)]
Merge remote-tracking branch 'rbultje/vp9-32bit-lpf'

* rbultje/vp9-32bit-lpf:
  vp9/x86: add myself to copyright holders for loopfilter assembly.
  vp9/x86: make filter_16_h work on 32-bit.
  vp9/x86: make filter_48/84/88_h work on 32-bit.
  vp9/x86: make filter_44_h work on 32-bit.
  vp9/x86: make filter_16_v work on 32-bit.
  vp9/x86: make filter_48/84_v work on 32-bit.
  vp9/x86: make filter_88_v work on 32-bit.
  vp9/x86: make filter_44_v work on 32-bit.
  vp8/x86: save one register in SIGN_ADD/SUB.
  vp9/x86: store unpacked intermediates for filter6/14 on stack.
  vp8/x86: move variable assigned inside macro branch.
  vp9/x86: simplify ABSSUM_CMP by inverting the comparison meaning.
  vp8/x86: remove unused register from ABSSUB_CMP macro.
  vp9/x86: slightly simplify 44/48/84/88 h stores.
  vp9/x86: make cglobal statement more conservative in register allocation.
  vp9/x86: save one register in loopfilter surface coverage.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agor210enc.c: Simplify and never store more than 10 bits.
Reimar Döffinger [Sat, 27 Dec 2014 21:49:39 +0000 (22:49 +0100)]
r210enc.c: Simplify and never store more than 10 bits.

The r10k and avrp decoders would previously store 12 bit precision
for the blue channel, which is inconsistent and probably not a
desirable behaviour.
Now the 2 unused extra bits are set to 0.
This is possibly not ideal either as RGBA1010102 format has the same
layout but stores alpha in these bits, thus explicitly setting them
to 1 might be preferable.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
4 years agovp9/x86: add myself to copyright holders for loopfilter assembly.
Ronald S. Bultje [Sat, 27 Dec 2014 19:55:04 +0000 (14:55 -0500)]
vp9/x86: add myself to copyright holders for loopfilter assembly.

4 years agovp9/x86: make filter_16_h work on 32-bit.
Ronald S. Bultje [Fri, 26 Dec 2014 22:50:38 +0000 (17:50 -0500)]
vp9/x86: make filter_16_h work on 32-bit.

4 years agovp9/x86: make filter_48/84/88_h work on 32-bit.
Ronald S. Bultje [Fri, 26 Dec 2014 20:15:50 +0000 (15:15 -0500)]
vp9/x86: make filter_48/84/88_h work on 32-bit.

4 years agovp9/x86: make filter_44_h work on 32-bit.
Ronald S. Bultje [Fri, 26 Dec 2014 19:48:01 +0000 (14:48 -0500)]
vp9/x86: make filter_44_h work on 32-bit.

4 years agovp9/x86: make filter_16_v work on 32-bit.
Ronald S. Bultje [Fri, 26 Dec 2014 19:05:23 +0000 (14:05 -0500)]
vp9/x86: make filter_16_v work on 32-bit.

4 years agovp9/x86: make filter_48/84_v work on 32-bit.
Ronald S. Bultje [Fri, 26 Dec 2014 17:10:26 +0000 (12:10 -0500)]
vp9/x86: make filter_48/84_v work on 32-bit.

4 years agovp9/x86: make filter_88_v work on 32-bit.
Ronald S. Bultje [Sat, 27 Dec 2014 20:12:01 +0000 (15:12 -0500)]
vp9/x86: make filter_88_v work on 32-bit.

4 years agovp9/x86: make filter_44_v work on 32-bit.
Ronald S. Bultje [Sat, 27 Dec 2014 20:08:48 +0000 (15:08 -0500)]
vp9/x86: make filter_44_v work on 32-bit.

4 years agovp8/x86: save one register in SIGN_ADD/SUB.
Ronald S. Bultje [Sat, 27 Dec 2014 19:47:07 +0000 (14:47 -0500)]
vp8/x86: save one register in SIGN_ADD/SUB.

4 years agovp9/x86: store unpacked intermediates for filter6/14 on stack.
Ronald S. Bultje [Wed, 24 Dec 2014 19:17:28 +0000 (14:17 -0500)]
vp9/x86: store unpacked intermediates for filter6/14 on stack.

filter16 goes from 508 to 482 (h) or 346 to 314 (v) cycles; filter88
goes from 240 to 238 (h) or 174 to 165 (v) cycles, measured on TOS.

4 years agovp8/x86: move variable assigned inside macro branch.
Ronald S. Bultje [Wed, 24 Dec 2014 19:22:19 +0000 (14:22 -0500)]
vp8/x86: move variable assigned inside macro branch.

The value is not used outside the branch.

4 years agovp9/x86: simplify ABSSUM_CMP by inverting the comparison meaning.
Ronald S. Bultje [Mon, 22 Dec 2014 00:34:03 +0000 (19:34 -0500)]
vp9/x86: simplify ABSSUM_CMP by inverting the comparison meaning.