ffmpeg.git
4 years agoMerge commit '39f01e346cab464ef6c0d4ec58cc13b7123e60d8'
Hendrik Leppkes [Mon, 5 Oct 2015 09:34:11 +0000 (11:34 +0200)]
Merge commit '39f01e346cab464ef6c0d4ec58cc13b7123e60d8'

* commit '39f01e346cab464ef6c0d4ec58cc13b7123e60d8':
  mmaldec: be more tolerant against MMAL not returning decoded output

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '65db4899fa8790049bec3af16ecdb75dd81051fd'
Hendrik Leppkes [Mon, 5 Oct 2015 09:34:04 +0000 (11:34 +0200)]
Merge commit '65db4899fa8790049bec3af16ecdb75dd81051fd'

* commit '65db4899fa8790049bec3af16ecdb75dd81051fd':
  mmaldec: refactor to have more context per MMAL input buffer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'eae58428bd199f7d4670bf471f56ed204430878e'
Hendrik Leppkes [Mon, 5 Oct 2015 09:33:43 +0000 (11:33 +0200)]
Merge commit 'eae58428bd199f7d4670bf471f56ed204430878e'

* commit 'eae58428bd199f7d4670bf471f56ed204430878e':
  avcodec: Do not lock during open for codecs marked as having threadsafe init

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'abe9adfb31566c415fd830a8d4977c79512d4385'
Hendrik Leppkes [Mon, 5 Oct 2015 09:30:53 +0000 (11:30 +0200)]
Merge commit 'abe9adfb31566c415fd830a8d4977c79512d4385'

* commit 'abe9adfb31566c415fd830a8d4977c79512d4385':
  rangecoder: Use AV_RB16 instead of bytestream_get_be16

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'b8b13acd70a1c1b6c044f967d78cb82f1a53887b'
Hendrik Leppkes [Mon, 5 Oct 2015 09:29:22 +0000 (11:29 +0200)]
Merge commit 'b8b13acd70a1c1b6c044f967d78cb82f1a53887b'

* commit 'b8b13acd70a1c1b6c044f967d78cb82f1a53887b':
  hevc: Simplify logical check

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '10aa6f9db44e96977e7155fdc3e62619e0e00a15'
Hendrik Leppkes [Mon, 5 Oct 2015 09:28:17 +0000 (11:28 +0200)]
Merge commit '10aa6f9db44e96977e7155fdc3e62619e0e00a15'

* commit '10aa6f9db44e96977e7155fdc3e62619e0e00a15':
  h264: Use the correct argument context in debug log

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '4628443ca3534060888dd0015b229337eac13fd2'
Hendrik Leppkes [Mon, 5 Oct 2015 09:27:07 +0000 (11:27 +0200)]
Merge commit '4628443ca3534060888dd0015b229337eac13fd2'

* commit '4628443ca3534060888dd0015b229337eac13fd2':
  h263: Drop uninitialized variable use from log message

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '1da2a20763ae9ca579d5fd20763065871ddf6311'
Hendrik Leppkes [Mon, 5 Oct 2015 09:24:10 +0000 (11:24 +0200)]
Merge commit '1da2a20763ae9ca579d5fd20763065871ddf6311'

* commit '1da2a20763ae9ca579d5fd20763065871ddf6311':
  dvbsubdec: Fix function return type

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'cab63a8b594cdc365bb2581a12b3ac8e6dd480b2'
Hendrik Leppkes [Mon, 5 Oct 2015 09:21:23 +0000 (11:21 +0200)]
Merge commit 'cab63a8b594cdc365bb2581a12b3ac8e6dd480b2'

* commit 'cab63a8b594cdc365bb2581a12b3ac8e6dd480b2':
  dv: Mark internal frame reference as const

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '4c160fa23996c05efcd952ccfac2359311d8a1bc'
Hendrik Leppkes [Mon, 5 Oct 2015 09:19:38 +0000 (11:19 +0200)]
Merge commit '4c160fa23996c05efcd952ccfac2359311d8a1bc'

* commit '4c160fa23996c05efcd952ccfac2359311d8a1bc':
  dcadec: Always initialize return variable

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'bb198c4997d5036f3bf91de51e44f807115677d0'
Hendrik Leppkes [Mon, 5 Oct 2015 09:18:31 +0000 (11:18 +0200)]
Merge commit 'bb198c4997d5036f3bf91de51e44f807115677d0'

* commit 'bb198c4997d5036f3bf91de51e44f807115677d0':
  d3d11va: make av_d3d11va_alloc_context() available at all times

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'f3202871598f59b570b31b01cfeb64b8fedbd700'
Hendrik Leppkes [Mon, 5 Oct 2015 09:18:08 +0000 (11:18 +0200)]
Merge commit 'f3202871598f59b570b31b01cfeb64b8fedbd700'

* commit 'f3202871598f59b570b31b01cfeb64b8fedbd700':
  d3d11va: check for malloc failure

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '2c3dbff1d89bbf8300c121c06524c014cb6e0915'
Hendrik Leppkes [Mon, 5 Oct 2015 09:17:24 +0000 (11:17 +0200)]
Merge commit '2c3dbff1d89bbf8300c121c06524c014cb6e0915'

* commit '2c3dbff1d89bbf8300c121c06524c014cb6e0915':
  avutil/avstring: Inline some tiny functions

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'f56a08559334b7eb6b3fedbc0cc741887f6067ae'
Hendrik Leppkes [Mon, 5 Oct 2015 09:12:12 +0000 (11:12 +0200)]
Merge commit 'f56a08559334b7eb6b3fedbc0cc741887f6067ae'

* commit 'f56a08559334b7eb6b3fedbc0cc741887f6067ae':
  matroskaenc: Don't write a track language tag

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '8bb376cf6b4ab8645daedb8becaa7163656436a4'
Hendrik Leppkes [Mon, 5 Oct 2015 09:08:29 +0000 (11:08 +0200)]
Merge commit '8bb376cf6b4ab8645daedb8becaa7163656436a4'

* commit '8bb376cf6b4ab8645daedb8becaa7163656436a4':
  checkasm: Fix the function name sorting algorithm

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoffserver: avoid leaking pathname at exit
Reynaldo H. Verdejo Pinochet [Mon, 5 Oct 2015 05:29:49 +0000 (22:29 -0700)]
ffserver: avoid leaking pathname at exit

Fixes Coverity CID 1325681

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: fix up rate units in server messages
Reynaldo H. Verdejo Pinochet [Sun, 4 Oct 2015 21:45:49 +0000 (14:45 -0700)]
ffserver: fix up rate units in server messages

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: wrap around bandwidth exceeded msg text
Reynaldo H. Verdejo Pinochet [Sun, 4 Oct 2015 21:42:27 +0000 (14:42 -0700)]
ffserver: wrap around bandwidth exceeded msg text

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: wrap around too-busy message text
Reynaldo H. Verdejo Pinochet [Sun, 4 Oct 2015 21:28:01 +0000 (14:28 -0700)]
ffserver: wrap around too-busy message text

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: unify exit path in _write_index()
Reynaldo H. Verdejo Pinochet [Sun, 4 Oct 2015 21:08:57 +0000 (14:08 -0700)]
ffserver: unify exit path in _write_index()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: fix line wrapping on function decls
Reynaldo H. Verdejo Pinochet [Fri, 2 Oct 2015 21:01:24 +0000 (14:01 -0700)]
ffserver: fix line wrapping on function decls

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffplay: more robust mutex creation
Ganesh Ajjanagadde [Sun, 4 Oct 2015 16:04:41 +0000 (12:04 -0400)]
ffplay: more robust mutex creation

SDL_CreateMutex can fail:
https://wiki.libsdl.org/SDL_CreateMutex.
This patch makes creation more robust in one instance.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoconcatdec: fix metadata memleak on error
Marton Balint [Sat, 3 Oct 2015 21:48:38 +0000 (23:48 +0200)]
concatdec: fix metadata memleak on error

Fixes Coverity CID 1323077.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agolibavformat/tls_securetransport: fix argument evalulation order UB
Rodger Combs [Sun, 4 Oct 2015 19:37:52 +0000 (14:37 -0500)]
libavformat/tls_securetransport: fix argument evalulation order UB

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/tta: Un-break build without threads
Michael Niedermayer [Sun, 4 Oct 2015 20:57:55 +0000 (22:57 +0200)]
avcodec/tta: Un-break build without threads

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter: add displace video filter
Paul B Mahol [Thu, 23 Jul 2015 19:25:24 +0000 (19:25 +0000)]
avfilter: add displace video filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agommaldec: be more tolerant against MMAL not returning decoded output
wm4 [Wed, 23 Sep 2015 18:27:25 +0000 (20:27 +0200)]
mmaldec: be more tolerant against MMAL not returning decoded output

In some situations, MMAL won't return a decoded frame for certain input
frames. This can happen if a frame fails to decode, or if a packet does
not actually contain a complete frame. In these situations, we would
deadlock (or actually timeout) waiting for an expected output frame,
which is not ideal. On the other hand, there are situations where we
definitely have to block to avoid deadlocks. (This mess is a
consequence of trying to map MMAL's asynchronous and flexible
dataflow to libavcodec, which is more static and rigid.)

Solve this by doing a blocking wait only if the amount of buffered data
is too big. The whole purpose of the blocking wait is to avoid excessive
buffering of input data, so we can skip it if it appears to be low. The
consequence is that libavcodec can gracefully return no frame to the
API user.

We want to track the number of full packets to make our heuristic work.
But MMAL buffers are fixed-size, requiring splitting large packets. This
is why the previous commit is needed. We use the ..._FRAME_END flag to
remember packet boundaries, but MMAL does not preserve these buffer
flags when returning buffers to the user.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agommaldec: refactor to have more context per MMAL input buffer
wm4 [Wed, 23 Sep 2015 18:27:24 +0000 (20:27 +0200)]
mmaldec: refactor to have more context per MMAL input buffer

The next commit needs 1 bit of additional information per MMAL buffer
sent to the MMAL input port. This information will be needed when the
buffer is recycled (i.e. returned by the input port's callback).
Normally, we could use MMAL_BUFFER_HEADER_FLAG_USER0, but that is
unexpectedly not preserved.

Do this by storing a pointer to FFBufferEntry in the MMAL buffer's
user data, instead of an AVBufferRef. This also changes the lifetime
of FFBufferEntry.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoavcodec/alacdec: split off decorrelate_stereo and append_extra_bits as alacdsp
James Almer [Sun, 4 Oct 2015 17:09:05 +0000 (14:09 -0300)]
avcodec/alacdec: split off decorrelate_stereo and append_extra_bits as alacdsp

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec: use HAVE_THREADS header guards to silence -Wunused-function
Ganesh Ajjanagadde [Thu, 17 Sep 2015 02:22:27 +0000 (22:22 -0400)]
avcodec: use HAVE_THREADS header guards to silence -Wunused-function

When compiled with --disable-pthreads, e.g
http://fate.ffmpeg.org/report.cgi?time=20150917015044&slot=alpha-debian-qemu-gcc-4.7,
a bunch of -Wunused-functions are reported due to missing header guards
around threading related functions.
This patch should silence such warnings.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoall: add _DEFAULT_SOURCE locally wherever needed
Ganesh Ajjanagadde [Sat, 3 Oct 2015 12:41:00 +0000 (07:41 -0500)]
all: add _DEFAULT_SOURCE locally wherever needed

Glibc 2.20 onwards generates a deprecation warning for usage of _BSD_SOURCE and _SVID_SOURCE.
The solution from man feature_test_macros is to define both _DEFAULT_SOURCE and the old macros.
This solution is on the lines of the one in commit af1818276ef271af98e2e2bbabb4dc875b4fa7d8.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
4 years agoffplay: more robust thread creation
Ganesh Ajjanagadde [Sat, 3 Oct 2015 22:50:06 +0000 (18:50 -0400)]
ffplay: more robust thread creation

SDL_CreateThread can fail:
https://wiki.libsdl.org/SDL_CreateThread.
This patch makes thread creation more robust in one instance.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoChangelog: add note on ffplay dynamic volume control
Ganesh Ajjanagadde [Sun, 4 Oct 2015 02:36:06 +0000 (22:36 -0400)]
Changelog: add note on ffplay dynamic volume control

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agocheckasm: Fix compilation with --disable-avcodec
Henrik Gramner [Thu, 1 Oct 2015 17:25:33 +0000 (19:25 +0200)]
checkasm: Fix compilation with --disable-avcodec

4 years agoavformat/flacdec: support fast-seek
Ching Yi, Chan [Thu, 24 Sep 2015 05:04:40 +0000 (13:04 +0800)]
avformat/flacdec: support fast-seek

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec: Do not lock during open for codecs marked as having threadsafe init
Derek Buitenhuis [Thu, 1 Oct 2015 14:36:56 +0000 (15:36 +0100)]
avcodec: Do not lock during open for codecs marked as having threadsafe init

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoavfilter/ebur128: use AV_OPT_TYPE_BOOL for video option
Clément Bœsch [Sun, 4 Oct 2015 11:10:17 +0000 (13:10 +0200)]
avfilter/ebur128: use AV_OPT_TYPE_BOOL for video option

4 years agoavfilter/ebur128: add dualmono measurement option
Kyle Swanson [Wed, 30 Sep 2015 15:35:08 +0000 (10:35 -0500)]
avfilter/ebur128: add dualmono measurement option

4 years agorangecoder: Use AV_RB16 instead of bytestream_get_be16
Vittorio Giovara [Fri, 2 Oct 2015 10:43:42 +0000 (12:43 +0200)]
rangecoder: Use AV_RB16 instead of bytestream_get_be16

Silence an incompatible-pointer-types-discards-qualifiers warning from clang.
rangecoder.c:58:34: warning: passing
      'uint8_t **' (aka 'unsigned char **') to parameter of type
      'const uint8_t **' (aka 'const unsigned char **') discards qualifiers in
      nested pointer types [-Wincompatible-pointer-types-discards-qualifiers]

4 years agohevc: Simplify logical check
Vittorio Giovara [Fri, 2 Oct 2015 10:43:48 +0000 (12:43 +0200)]
hevc: Simplify logical check

The intended meaning is "if this block is the first block in a slice then
its left boundary is a slice boundary". Silence a logical-not-parentheses
warning from gcc.

4 years agoh264: Use the correct argument context in debug log
Vittorio Giovara [Fri, 2 Oct 2015 10:43:41 +0000 (12:43 +0200)]
h264: Use the correct argument context in debug log

4 years agoh263: Drop uninitialized variable use from log message
Vittorio Giovara [Fri, 2 Oct 2015 13:16:46 +0000 (15:16 +0200)]
h263: Drop uninitialized variable use from log message

4 years agodvbsubdec: Fix function return type
Vittorio Giovara [Fri, 2 Oct 2015 10:43:40 +0000 (12:43 +0200)]
dvbsubdec: Fix function return type

4 years agodv: Mark internal frame reference as const
Vittorio Giovara [Fri, 2 Oct 2015 10:43:39 +0000 (12:43 +0200)]
dv: Mark internal frame reference as const

Silence a warning due to frame assignment in dvenc. All uses of the
reference in dvdec are read only, except the ones in the main decoding
function, so use the frame pointer directly there.

4 years agodcadec: Always initialize return variable
Vittorio Giovara [Fri, 2 Oct 2015 10:43:44 +0000 (12:43 +0200)]
dcadec: Always initialize return variable

Silence an uninitialized warning from clang.

4 years agolavf: add chromaprint muxer
Rodger Combs [Sat, 3 Oct 2015 22:24:06 +0000 (17:24 -0500)]
lavf: add chromaprint muxer

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavformat/hlsenc: Use of uninitialized memory unlinking old files
DHE [Thu, 1 Oct 2015 23:21:33 +0000 (19:21 -0400)]
libavformat/hlsenc: Use of uninitialized memory unlinking old files

Fixes ticket#4900

Signed-off-by: DHE <git@dehacked.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibx264: copy A53 closed captions from source
DeHackEd [Tue, 29 Sep 2015 17:19:34 +0000 (13:19 -0400)]
libx264: copy A53 closed captions from source

Assumes 'GA94' format (ATSC standard)

Signed-off-by: DHE <git@dehacked.net>
Tested-by: Anshul <anshul.ffmpeg@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoblockdsp: reindent after parameter removal
Christophe Gisquet [Mon, 28 Sep 2015 12:03:36 +0000 (14:03 +0200)]
blockdsp: reindent after parameter removal

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/apedec: fix bug introduced in commit d3e5fbb1406995e07fccbff3ca8c1e24f57a1f7b
Ganesh Ajjanagadde [Sat, 3 Oct 2015 18:48:14 +0000 (14:48 -0400)]
avcodec/apedec: fix bug introduced in commit d3e5fbb1406995e07fccbff3ca8c1e24f57a1f7b

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavf/mlpdec: Simplify mlp/thd probe function.
Carl Eugen Hoyos [Sat, 3 Oct 2015 20:40:27 +0000 (22:40 +0200)]
lavf/mlpdec: Simplify mlp/thd probe function.

Move the demuxers into their own file.

4 years agoavfilter/vf_stereo3d: rewrite in preparation for SIMD
Paul B Mahol [Sat, 3 Oct 2015 20:12:17 +0000 (22:12 +0200)]
avfilter/vf_stereo3d: rewrite in preparation for SIMD

Also slightly faster.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoconfigure: silence preprocessor noise from dependency generation
Ganesh Ajjanagadde [Fri, 18 Sep 2015 19:28:47 +0000 (15:28 -0400)]
configure: silence preprocessor noise from dependency generation

Currently, errors are thrown for various macros while building that are completely bogus.
They occur during the dependency (.d) generation phase, and have no bearing on the compiled output,
since only the stdout is piped into the sed command to generate the .d files.
They basically occur as the relevant -I paths are not (and cannot be passed) during
the dependancy generation phase.
As such, this patch silences them.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/vf_blend: Fix argument types, fix segfault in asm
Michael Niedermayer [Sat, 3 Oct 2015 19:49:42 +0000 (21:49 +0200)]
avfilter/vf_blend: Fix argument types, fix segfault in asm

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavf/shortendec: Autodetect raw Shorten streams.
Carl Eugen Hoyos [Sat, 3 Oct 2015 19:48:16 +0000 (21:48 +0200)]
lavf/shortendec: Autodetect raw Shorten streams.

Move the demuxer into its own file.

4 years agoavfilter/vf_blend: add x86 SIMD for some modes
Paul B Mahol [Fri, 2 Oct 2015 15:22:42 +0000 (17:22 +0200)]
avfilter/vf_blend: add x86 SIMD for some modes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agovp9: 10/12bpp SIMD (sse2/ssse3/avx) for directional intra prediction.
Ronald S. Bultje [Fri, 2 Oct 2015 13:11:55 +0000 (09:11 -0400)]
vp9: 10/12bpp SIMD (sse2/ssse3/avx) for directional intra prediction.

4 years agovp9: 16bpp tm/dc/h/v intra pred simd (mostly sse2) functions.
Ronald S. Bultje [Fri, 25 Sep 2015 21:24:07 +0000 (17:24 -0400)]
vp9: 16bpp tm/dc/h/v intra pred simd (mostly sse2) functions.

4 years agovp9: sse2/ssse3/avx 16bpp loopfilter x86 simd.
Ronald S. Bultje [Wed, 30 Sep 2015 17:23:09 +0000 (13:23 -0400)]
vp9: sse2/ssse3/avx 16bpp loopfilter x86 simd.

4 years agocmdutils: silence unused warnings under --disable-swscale, --disable-swresample
Ganesh Ajjanagadde [Sat, 19 Sep 2015 14:20:26 +0000 (10:20 -0400)]
cmdutils: silence unused warnings under --disable-swscale, --disable-swresample

This patch silences such warnings by placing initializations under a header guard,
see e.g
http://fate.ffmpeg.org/log.cgi?time=20150919095430&log=compile&slot=x86_64-archlinux-gcc-disableswscale,
http://fate.ffmpeg.org/log.cgi?time=20150919095048&log=compile&slot=x86_64-archlinux-gcc-disableswresample
for examples of such warnings.
It also has the benefit of placing library specific #defines next to each other.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoffplay: more robust mutex, condition variable handling
Ganesh Ajjanagadde [Sat, 3 Oct 2015 12:34:49 +0000 (07:34 -0500)]
ffplay: more robust mutex, condition variable handling

SDL_CreateMutex and SDL_CreateCond can fail:
https://wiki.libsdl.org/SDL_CreateMutex.
This patch makes handling more robust in one instance.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoconfigure: Remove --disable-avutil which has no effect from help output.
Carl Eugen Hoyos [Sat, 3 Oct 2015 14:35:32 +0000 (16:35 +0200)]
configure: Remove --disable-avutil which has no effect from help output.

4 years agolavc/options_table: Add option flags to the truncated flag.
Carl Eugen Hoyos [Sat, 3 Oct 2015 14:24:00 +0000 (16:24 +0200)]
lavc/options_table: Add option flags to the truncated flag.

Also add a short description for the help output.

4 years agoavfilter/vf_tinterlace: add mergex2 mode
Paul B Mahol [Wed, 30 Sep 2015 13:35:55 +0000 (15:35 +0200)]
avfilter/vf_tinterlace: add mergex2 mode

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agocheckasm: Remove use of deprecated av_set_cpu_flags_mask()
Henrik Gramner [Sat, 26 Sep 2015 13:43:49 +0000 (15:43 +0200)]
checkasm: Remove use of deprecated av_set_cpu_flags_mask()

4 years agoconfigure: Change screenpresso_decoder to select zlib instead of dep
Michael Niedermayer [Sat, 3 Oct 2015 12:42:02 +0000 (14:42 +0200)]
configure: Change screenpresso_decoder to select zlib instead of dep

zlib is used as a suggest/select target not a dep

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/x86/hpeldsp_rnd_template: silence -Wunused-function on --disable-mmx
Ganesh Ajjanagadde [Tue, 29 Sep 2015 23:28:28 +0000 (19:28 -0400)]
avcodec/x86/hpeldsp_rnd_template: silence -Wunused-function on --disable-mmx

This silences some of the -Wunused-function warnings when compiled with --disable-mmx, e.g
http://fate.ffmpeg.org/log.cgi?time=20150919094617&log=compile&slot=x86_64-archlinux-gcc-disable-mmx.
Header guards are too brittle and ugly for this case.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agod3d11va: make av_d3d11va_alloc_context() available at all times
Anton Khirnov [Sun, 27 Sep 2015 18:54:01 +0000 (20:54 +0200)]
d3d11va: make av_d3d11va_alloc_context() available at all times

The public API should not depend on the build configuration.

4 years agod3d11va: check for malloc failure
Anton Khirnov [Sun, 27 Sep 2015 18:47:23 +0000 (20:47 +0200)]
d3d11va: check for malloc failure

4 years agoavutil/avstring: Inline some tiny functions
Henrik Gramner [Sat, 26 Sep 2015 20:27:36 +0000 (22:27 +0200)]
avutil/avstring: Inline some tiny functions

They're short enough that inlining them actually reduces code size due to
all the overhead associated with making a function call.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agomatroskaenc: Don't write a track language tag
John Stebbins [Fri, 25 Sep 2015 15:36:30 +0000 (08:36 -0700)]
matroskaenc: Don't write a track language tag

"language" is not an offical matroska tag.
Track languages are specified with the MATROSKA_ID_TRACKLANGUAGE ebml.
Writing the tag overrides the ebml specified language during playback with
libav and some other players.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agocheckasm: Fix the function name sorting algorithm
Henrik Gramner [Mon, 28 Sep 2015 14:50:31 +0000 (16:50 +0200)]
checkasm: Fix the function name sorting algorithm

The previous implementation was behaving incorrectly in some corner cases.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agolavf/hls: allow subtitles to be read despite incomplete handling
Rodger Combs [Mon, 21 Sep 2015 10:31:24 +0000 (05:31 -0500)]
lavf/hls: allow subtitles to be read despite incomplete handling

This will give incorrect results in some cases due to not parsing segments
separately, so it currently requires -strict experimental.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit 'e54d7e4e8ef7d778e2ddc5a60bf7307ed55d6333'
Hendrik Leppkes [Sat, 3 Oct 2015 10:49:22 +0000 (12:49 +0200)]
Merge commit 'e54d7e4e8ef7d778e2ddc5a60bf7307ed55d6333'

* commit 'e54d7e4e8ef7d778e2ddc5a60bf7307ed55d6333':
  dnxhddata: Deduplicate cid 1256 chroma table

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '1fb63d6f43c348e9c990fa6f7c1bd43f22bc2389'
Hendrik Leppkes [Sat, 3 Oct 2015 10:48:41 +0000 (12:48 +0200)]
Merge commit '1fb63d6f43c348e9c990fa6f7c1bd43f22bc2389'

* commit '1fb63d6f43c348e9c990fa6f7c1bd43f22bc2389':
  dnxhddata: Deduplicate dnx100 tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'cc320296ab438dfe3178f0e1f775af955fe6c064'
Hendrik Leppkes [Sat, 3 Oct 2015 10:47:35 +0000 (12:47 +0200)]
Merge commit 'cc320296ab438dfe3178f0e1f775af955fe6c064'

* commit 'cc320296ab438dfe3178f0e1f775af955fe6c064':
  dnxhddata: Fix cid 1260 luma and chroma tables

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'bfe1cd80ebeab58cbc1c91ac766a96fce8e4ec1e'
Hendrik Leppkes [Sat, 3 Oct 2015 10:47:20 +0000 (12:47 +0200)]
Merge commit 'bfe1cd80ebeab58cbc1c91ac766a96fce8e4ec1e'

* commit 'bfe1cd80ebeab58cbc1c91ac766a96fce8e4ec1e':
  dnxhddata: Fix 10-bit DNxHD quant matrices

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '380146924ecad2e05e9dcc5c3c2e1b5ba47c51e8'
Hendrik Leppkes [Sat, 3 Oct 2015 10:46:01 +0000 (12:46 +0200)]
Merge commit '380146924ecad2e05e9dcc5c3c2e1b5ba47c51e8'

* commit '380146924ecad2e05e9dcc5c3c2e1b5ba47c51e8':
  x264: Add option to force IDR frames

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'eb02387add350f2b34a3e61539fe25ec6213eb18'
Hendrik Leppkes [Sat, 3 Oct 2015 10:43:46 +0000 (12:43 +0200)]
Merge commit 'eb02387add350f2b34a3e61539fe25ec6213eb18'

* commit 'eb02387add350f2b34a3e61539fe25ec6213eb18':
  x264: Expose the NV21 input support

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '74942685cb457c01937686892878403a409baf27'
Hendrik Leppkes [Sat, 3 Oct 2015 10:43:28 +0000 (12:43 +0200)]
Merge commit '74942685cb457c01937686892878403a409baf27'

* commit '74942685cb457c01937686892878403a409baf27':
  hls: Check av_opt_set_dict return value as well

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'd0a3e89d41b05f9ed0e7401c352b60ed4f4d1ed5'
Hendrik Leppkes [Sat, 3 Oct 2015 10:36:42 +0000 (12:36 +0200)]
Merge commit 'd0a3e89d41b05f9ed0e7401c352b60ed4f4d1ed5'

* commit 'd0a3e89d41b05f9ed0e7401c352b60ed4f4d1ed5':
  dcadec: make a number of samples per subband per subsubframe a named constant

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '8ae1d87a2440cea0564efe2a6c9c223478a05f44'
Hendrik Leppkes [Sat, 3 Oct 2015 10:29:19 +0000 (12:29 +0200)]
Merge commit '8ae1d87a2440cea0564efe2a6c9c223478a05f44'

* commit '8ae1d87a2440cea0564efe2a6c9c223478a05f44':
  build: Add support for known custom allocators

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa'
Hendrik Leppkes [Sat, 3 Oct 2015 10:22:41 +0000 (12:22 +0200)]
Merge commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa'

* commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa':
  Screenpresso SPV1 decoder

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agolavf/utils: avoid giving up probing early with long subtitle events
Rodger Combs [Sat, 3 Oct 2015 03:39:24 +0000 (22:39 -0500)]
lavf/utils: avoid giving up probing early with long subtitle events

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/h264_ps: Fix copying oversized pps&sps data
Michael Niedermayer [Fri, 2 Oct 2015 19:02:08 +0000 (21:02 +0200)]
avcodec/h264_ps: Fix copying oversized pps&sps data

Fixes: https://trac.ffmpeg.org/attachment/ticket/685/movie.264

In the available testcase the actual PPS only uses a few bits
while there are 7kbyte of apparently random data after it

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '1aa24df74c052a73175c43e57d35b4835e537ec8'
Hendrik Leppkes [Sat, 3 Oct 2015 07:52:39 +0000 (09:52 +0200)]
Merge commit '1aa24df74c052a73175c43e57d35b4835e537ec8'

* commit '1aa24df74c052a73175c43e57d35b4835e537ec8':
  lavu: Deprecate AVFrame.error[]

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '3f1f6053013d0015e9f115a91a11744807649a07'
Hendrik Leppkes [Sat, 3 Oct 2015 07:32:47 +0000 (09:32 +0200)]
Merge commit '3f1f6053013d0015e9f115a91a11744807649a07'

* commit '3f1f6053013d0015e9f115a91a11744807649a07':
  configure: address a copy-paste typo

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoavformat/flvdec: accept sizes if they are off by 11
Michael Niedermayer [Fri, 2 Oct 2015 18:05:06 +0000 (20:05 +0200)]
avformat/flvdec: accept sizes if they are off by 11

This error was produced by rtmproto.c, it is possibly such streams
where dumped, this commit is needed to support them

Fixes: z0e.flv

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/videotoolbox: fix decoding of some h264 bitstreams
wm4 [Fri, 2 Oct 2015 15:18:06 +0000 (17:18 +0200)]
avcodec/videotoolbox: fix decoding of some h264 bitstreams

This affects Annex B streams (such as demuxed from .ts and others). It
also handles the format change in reinit-large_420_8-to-small_420_8.h264
correctly.

Instead of passing through the extradata, create it on the fly it from
the currently active SPS and PPS. Since reconstructing the PPS and SPS
NALs would be very complicated and verbose, we use the NALs as they
originally appeared in the bitstream.

The code for writing the extradata is somewhat derived from
libavformat/avc.c, but it's small and different enough that sharing it
is not really worth it.

4 years agoavcodec/h264: keep SPS and PPS bitstream data
wm4 [Fri, 2 Oct 2015 15:18:00 +0000 (17:18 +0200)]
avcodec/h264: keep SPS and PPS bitstream data

We assume an upper bound of 4096 bytes for each raw SPS/PPS. It's hard
to determine an exact maximum size, but this value was was considered
high enough and safe.

Needed for the following VideotoolBox commit.

4 years agodnxhddec: init scantable once permutation is set
Christophe Gisquet [Thu, 1 Oct 2015 20:01:27 +0000 (22:01 +0200)]
dnxhddec: init scantable once permutation is set

Otherwise, the dsp may change without its permuation being applied.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agodnxhddec: use dequantization formula from specs
Christophe Gisquet [Thu, 1 Oct 2015 20:01:26 +0000 (22:01 +0200)]
dnxhddec: use dequantization formula from specs

The current one, while correct, does not yield the best possible
results. The specificiations suggest another formula, which results
in quality gains in the decoded output from fate tests. This
justifies changing said formula.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agodnxhddec: initialize with mb-aligned dimensions
Christophe Gisquet [Wed, 30 Sep 2015 08:14:59 +0000 (10:14 +0200)]
dnxhddec: initialize with mb-aligned dimensions

The coded size is a multiple of the macroblock size, which is 16.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/vf_maskedmerge: add SIMD for maskedmerge with 8 bit depth input
Paul B Mahol [Wed, 30 Sep 2015 21:00:14 +0000 (23:00 +0200)]
avfilter/vf_maskedmerge: add SIMD for maskedmerge with 8 bit depth input

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec: Don't lock during open if the codec has threadsafe init
Derek Buitenhuis [Thu, 1 Oct 2015 14:38:15 +0000 (15:38 +0100)]
avcodec: Don't lock during open if the codec has threadsafe init

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agodnxhddata: Deduplicate cid 1256 chroma table
Christophe Gisquet [Thu, 1 Oct 2015 14:54:57 +0000 (16:54 +0200)]
dnxhddata: Deduplicate cid 1256 chroma table

CID 1256 is specified as using the same table for luma and chroma,
which is the same as CID 1235 luma table. This is consistent with
the format supposedly being RGB, although most sequences seem to
actually be YCbCr-encoded.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agodnxhddata: Deduplicate dnx100 tables
Jeremy James [Thu, 1 Oct 2015 14:54:56 +0000 (16:54 +0200)]
dnxhddata: Deduplicate dnx100 tables

Tables 1258 and 1259 were not zigzagged when added, so it was not
possible to notice the equivalence.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agodnxhddata: Fix cid 1260 luma and chroma tables
Jeremy James [Thu, 1 Oct 2015 14:54:55 +0000 (16:54 +0200)]
dnxhddata: Fix cid 1260 luma and chroma tables

These table was not zigzagged when added.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agodnxhddata: Fix 10-bit DNxHD quant matrices
Joseph Artsimovich [Thu, 1 Oct 2015 15:06:26 +0000 (17:06 +0200)]
dnxhddata: Fix 10-bit DNxHD quant matrices

Convert them to zigzag order, as the rest of them are.

When I was adding support for 10-bit DNxHD, I just copy-pasted the
missing quant matrices from the spec. Now it turns out the existing
matrices in dnxhddata.c were in zigzag order. This resulted in wrong
quantization for 10-bit DNxHD. The attached patch fixes the problem by
converting 10-bit quant matrices to zigzag order.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/af_rubberband: add process_command()
Paul B Mahol [Wed, 30 Sep 2015 19:40:54 +0000 (21:40 +0200)]
avfilter/af_rubberband: add process_command()

Signed-off-by: Paul B Mahol <onemda@gmail.com>