ffmpeg.git
6 years agoavutil/x86/cpu: fix cpuid sub-leaf selection
lvqcl [Sat, 27 Sep 2014 11:21:31 +0000 (13:21 +0200)]
avutil/x86/cpu: fix cpuid sub-leaf selection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotests/fate/microsoft: add -flags +bitexact to ilaced_twomv
Michael Niedermayer [Sat, 27 Sep 2014 11:00:25 +0000 (13:00 +0200)]
tests/fate/microsoft: add -flags +bitexact to ilaced_twomv

Should fix fate failure on alpha and pre sse2 x86

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: remove CodingTree
Christophe Gisquet [Tue, 23 Sep 2014 21:36:41 +0000 (21:36 +0000)]
hevc: remove CodingTree

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/signalstats: add more pixel formats
Paul B Mahol [Thu, 25 Sep 2014 17:25:00 +0000 (17:25 +0000)]
avfilter/signalstats: add more pixel formats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoffplay: Separate AVFrame from AVSubtitle
Michael Niedermayer [Fri, 26 Sep 2014 16:11:16 +0000 (18:11 +0200)]
ffplay: Separate AVFrame from AVSubtitle

This is more robust and should avoid false positives in coverity
That is if the type is ever mixed up, after this patch that would
just be a null pointer dereference instead of a random possibly
out of array access

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4e03b2097ca59843ed65424a572b7acd5345f088'
Michael Niedermayer [Sat, 27 Sep 2014 01:38:12 +0000 (03:38 +0200)]
Merge commit '4e03b2097ca59843ed65424a572b7acd5345f088'

* commit '4e03b2097ca59843ed65424a572b7acd5345f088':
  mpeg12: Always invoke the get_format() callback

Conflicts:
libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ce42316321145c435029dc288c2b5f1d48519dde'
Michael Niedermayer [Sat, 27 Sep 2014 01:16:58 +0000 (03:16 +0200)]
Merge commit 'ce42316321145c435029dc288c2b5f1d48519dde'

* commit 'ce42316321145c435029dc288c2b5f1d48519dde':
  h264: Always invoke the get_format() callback

Conflicts:
libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2'
Michael Niedermayer [Sat, 27 Sep 2014 00:42:30 +0000 (02:42 +0200)]
Merge commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2'

* commit '1c80c9d7ef809180042257200c7b5f6b81d0b0e2':
  hwaccel: Call ->get_format again if hwaccel init fails

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9d2cee52d37c7340f85a5d41110282aac03e6855'
Michael Niedermayer [Sat, 27 Sep 2014 00:12:21 +0000 (02:12 +0200)]
Merge commit '9d2cee52d37c7340f85a5d41110282aac03e6855'

* commit '9d2cee52d37c7340f85a5d41110282aac03e6855':
  configure: Assume a standard-compliant default libc

See: 170e2fd7c39c430b334ea80a1e4dfb10c6fd1e95
Note, the change is not merged to avoid breaking netbsd and others.
once the netbsd (and any other breakages are dealt with the
else based solution could be used and 170e2fd7c39c430b334ea80a1e4dfb10c6fd1e95
could then be reverted)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8'
Michael Niedermayer [Fri, 26 Sep 2014 23:49:24 +0000 (01:49 +0200)]
Merge commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8'

* commit '6cfbe1de5ac6c57c41459626f7ac32841d63ace8':
  avconv: Use only audio and video to guess discontinuities

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/fmtconvert: add ff_int32_to_float_fmul_array8_{sse,sse2}
James Almer [Fri, 26 Sep 2014 23:46:41 +0000 (20:46 -0300)]
x86/fmtconvert: add ff_int32_to_float_fmul_array8_{sse,sse2}

About two times faster than the c wrapper.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoMerge commit '883e98bc25755327565d8ae0f565a6c886f24816'
Michael Niedermayer [Fri, 26 Sep 2014 23:35:46 +0000 (01:35 +0200)]
Merge commit '883e98bc25755327565d8ae0f565a6c886f24816'

* commit '883e98bc25755327565d8ae0f565a6c886f24816':
  probe: Bump the score for mime type matching

Conflicts:
libavformat/format.c

See: bcac0f401001e6ebb0ae2718cc42d30b2009de4b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd995f0a1550c9148140eab34c7d770e90925c004'
Michael Niedermayer [Fri, 26 Sep 2014 23:29:24 +0000 (01:29 +0200)]
Merge commit 'd995f0a1550c9148140eab34c7d770e90925c004'

* commit 'd995f0a1550c9148140eab34c7d770e90925c004':
  log: Unbreak no-tty support on 256color terminals

Conflicts:
libavutil/log.c

No change, FFmpeg is not affected by this bug

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavfilter/af_amix: avoid derreferencing possible null
Reynaldo H. Verdejo Pinochet [Fri, 26 Sep 2014 19:37:28 +0000 (16:37 -0300)]
libavfilter/af_amix: avoid derreferencing possible null

ff_all_channel_layouts() might return null on alloc failure.

Fixes CID1241516

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
6 years agolibavfilter/af_channelmap: avoid derreferencing possible null
Reynaldo H. Verdejo Pinochet [Fri, 26 Sep 2014 16:58:22 +0000 (13:58 -0300)]
libavfilter/af_channelmap: avoid derreferencing possible null

ff_all_channel_layouts() might return null on alloc failure.

Fixes CID1241517

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
6 years agolibavfilter/af_join: avoid derreferencing possible null
Reynaldo H. Verdejo Pinochet [Fri, 26 Sep 2014 15:52:09 +0000 (12:52 -0300)]
libavfilter/af_join: avoid derreferencing possible null

ff_all_channel_layouts() might return null on alloc failure.

Fixes CID1241518

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
6 years agoMerge commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6'
Michael Niedermayer [Fri, 26 Sep 2014 20:27:37 +0000 (22:27 +0200)]
Merge commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6'

* commit '7703995a2e8760e66ff35148bf029e0f9e30dbe6':
  flac: Remove unused headers

Conflicts:
libavcodec/flacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc'
Michael Niedermayer [Fri, 26 Sep 2014 20:18:07 +0000 (22:18 +0200)]
Merge commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc'

* commit 'cc4992aaf3dbb0af88d9727983d75636baf1f8cc':
  ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4c2fd4b262347273afe97865ba451a1abde43ae6'
Michael Niedermayer [Fri, 26 Sep 2014 20:06:46 +0000 (22:06 +0200)]
Merge commit '4c2fd4b262347273afe97865ba451a1abde43ae6'

* commit '4c2fd4b262347273afe97865ba451a1abde43ae6':
  ac3enc: allow Dolby Pro Logic II as a preferred downmix mode.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b39ebcddd47daf37659796aaa7d068668086507a'
Michael Niedermayer [Fri, 26 Sep 2014 19:00:27 +0000 (21:00 +0200)]
Merge commit 'b39ebcddd47daf37659796aaa7d068668086507a'

* commit 'b39ebcddd47daf37659796aaa7d068668086507a':
  fate: Add VC-1 interlaced twomv test

Note, this test is not free of artifacts on both sides of the merge

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg12: Always invoke the get_format() callback
Rémi Denis-Courmont [Thu, 25 Sep 2014 08:59:58 +0000 (11:59 +0300)]
mpeg12: Always invoke the get_format() callback

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoh264: Always invoke the get_format() callback
Rémi Denis-Courmont [Thu, 25 Sep 2014 08:59:57 +0000 (11:59 +0300)]
h264: Always invoke the get_format() callback

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agohwaccel: Call ->get_format again if hwaccel init fails
Rémi Denis-Courmont [Tue, 16 Sep 2014 19:17:47 +0000 (22:17 +0300)]
hwaccel: Call ->get_format again if hwaccel init fails

This allows the application to fall back on another hwaccel or,
more likely, software decoding.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoconfigure: Assume a standard-compliant default libc
Luca Barbato [Thu, 11 Sep 2014 13:48:13 +0000 (15:48 +0200)]
configure: Assume a standard-compliant default libc

Non-standard compliant libc should be supported on a per-case basis
anyway.

6 years agoavconv: Use only audio and video to guess discontinuities
Luca Barbato [Sat, 13 Sep 2014 00:00:32 +0000 (02:00 +0200)]
avconv: Use only audio and video to guess discontinuities

Data and subtitle streams might cause false positive.

6 years agoprobe: Bump the score for mime type matching
Andreas Cadhalpun [Fri, 12 Sep 2014 23:25:22 +0000 (01:25 +0200)]
probe: Bump the score for mime type matching

It should be more trustworthy than extension matching.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agolog: Unbreak no-tty support on 256color terminals
Luca Barbato [Fri, 12 Sep 2014 22:26:21 +0000 (00:26 +0200)]
log: Unbreak no-tty support on 256color terminals

6 years agoMerge commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab'
Michael Niedermayer [Fri, 26 Sep 2014 18:53:48 +0000 (20:53 +0200)]
Merge commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab'

* commit 'a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab':
  vc1: Use logical instead of bitwise or for twomv

See: 1e2ab98460761c86268993e7a7ee690876df5efd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c'
Michael Niedermayer [Fri, 26 Sep 2014 18:47:11 +0000 (20:47 +0200)]
Merge commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c'

* commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c':
  vc1: Use logical instead of bitwise or for coded_inter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoflac: Remove unused headers
Tristan Matthews [Fri, 12 Sep 2014 22:50:03 +0000 (18:50 -0400)]
flac: Remove unused headers

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.
Tim Walker [Tue, 18 Feb 2014 02:39:52 +0000 (03:39 +0100)]
ac3enc: allow Dolby Pro Logic IIz as the Dolby Surround EX mode.

This is actually defined in the A/52 specification.

6 years agoac3enc: allow Dolby Pro Logic II as a preferred downmix mode.
Tim Walker [Tue, 18 Feb 2014 02:39:51 +0000 (03:39 +0100)]
ac3enc: allow Dolby Pro Logic II as a preferred downmix mode.

Some encoders already use this value even
though it's reserved in the A/52 specification.

6 years agofate: Add VC-1 interlaced twomv test
Tim Walker [Sun, 21 Sep 2014 15:16:33 +0000 (16:16 +0100)]
fate: Add VC-1 interlaced twomv test

CC: libav-stable@libav.org
6 years agovc1: Use logical instead of bitwise or for twomv
Michael Niedermayer [Sun, 21 Sep 2014 15:16:32 +0000 (16:16 +0100)]
vc1: Use logical instead of bitwise or for twomv

CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
6 years agovc1: Use logical instead of bitwise or for coded_inter
Tim Walker [Thu, 25 Sep 2014 16:34:26 +0000 (18:34 +0200)]
vc1: Use logical instead of bitwise or for coded_inter

This appears to be the intended behavior.

6 years agolibavformat/iff: print error message when DSDIFF compression type is not supported
Peter Ross [Fri, 26 Sep 2014 05:44:46 +0000 (15:44 +1000)]
libavformat/iff: print error message when DSDIFF compression type is not supported

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/dxtory: remove unused variables
Michael Niedermayer [Fri, 26 Sep 2014 10:47:21 +0000 (12:47 +0200)]
avcodec/dxtory: remove unused variables

Found-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b97f6ef956293fe06ae1e99bd295f42613081f37'
Michael Niedermayer [Fri, 26 Sep 2014 10:29:41 +0000 (12:29 +0200)]
Merge commit 'b97f6ef956293fe06ae1e99bd295f42613081f37'

* commit 'b97f6ef956293fe06ae1e99bd295f42613081f37':
  pcm-dvd: Move a variable to a smaller scope

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2'
Michael Niedermayer [Fri, 26 Sep 2014 10:23:55 +0000 (12:23 +0200)]
Merge commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2'

* commit '4d5b99dacdbb56373e5abe2ad35fc87b5c0c5bd2':
  caf: Give context structure a consistent name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/avfoundation: Use microseconds as common timebase.
Thilo Borgmann [Tue, 23 Sep 2014 14:49:59 +0000 (16:49 +0200)]
lavd/avfoundation: Use microseconds as common timebase.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopcm-dvd: Move a variable to a smaller scope
Diego Biurrun [Fri, 26 Sep 2014 07:42:52 +0000 (00:42 -0700)]
pcm-dvd: Move a variable to a smaller scope

This avoids an unused variable warning on big-endian systems.

6 years agoavformat/srtdec: simpler and more lenient probing
Clément Bœsch [Fri, 26 Sep 2014 05:29:22 +0000 (07:29 +0200)]
avformat/srtdec: simpler and more lenient probing

Fixes Ticket #3935.

6 years agoavformat: add SUP/PGS subtitle demuxer
wm4 [Wed, 24 Sep 2014 15:38:58 +0000 (17:38 +0200)]
avformat: add SUP/PGS subtitle demuxer

Signed-off-by: Clément Bœsch <u@pkh.me>
6 years agocaf: Give context structure a consistent name
Diego Biurrun [Thu, 25 Sep 2014 14:42:30 +0000 (16:42 +0200)]
caf: Give context structure a consistent name

6 years agolavd/avfoundation: Simplify debug message generation.
Thilo Borgmann [Tue, 23 Sep 2014 14:49:16 +0000 (16:49 +0200)]
lavd/avfoundation: Simplify debug message generation.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/avfoundation: Using the actual stream index instead of hardcoded value.
Thilo Borgmann [Tue, 23 Sep 2014 14:48:06 +0000 (16:48 +0200)]
lavd/avfoundation: Using the actual stream index instead of hardcoded value.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/avfoundation: Split adding a device and getting the device configuration into...
Thilo Borgmann [Wed, 24 Sep 2014 10:16:31 +0000 (12:16 +0200)]
lavd/avfoundation: Split adding a device and getting the device configuration into separate functions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAutodetect jpg images.
Carl Eugen Hoyos [Thu, 25 Sep 2014 21:02:06 +0000 (23:02 +0200)]
Autodetect jpg images.

Based on 2d3842f5 by Michael Niedermayer.

Fixes ticket #2541.

6 years agoSupport libopenjpeg 2.x via libopenmj2.
Carl Eugen Hoyos [Thu, 25 Sep 2014 20:35:39 +0000 (22:35 +0200)]
Support libopenjpeg 2.x via libopenmj2.

Based on a patch by Marius Cirsta.

Fixes ticket #2016.

6 years agoShow correct pix_fmt for vp9 videos != AV_PIX_FMT_YUV420P.
Carl Eugen Hoyos [Thu, 25 Sep 2014 20:33:31 +0000 (22:33 +0200)]
Show correct pix_fmt for vp9 videos != AV_PIX_FMT_YUV420P.

6 years agoavcodec/dxtory: Support dxtory-2.0.127.avi
Michael Niedermayer [Thu, 25 Sep 2014 21:42:03 +0000 (23:42 +0200)]
avcodec/dxtory: Support dxtory-2.0.127.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/x86/idctdsp.h: Fix make checkheaders.
Carl Eugen Hoyos [Thu, 25 Sep 2014 20:18:25 +0000 (22:18 +0200)]
lavc/x86/idctdsp.h: Fix make checkheaders.

6 years agoavcodec/svq1enc: align buffer used by simd functions
James Almer [Thu, 25 Sep 2014 18:17:13 +0000 (15:17 -0300)]
avcodec/svq1enc: align buffer used by simd functions

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agox86/cavsdsp: fix buffer alignment in cavs_idct8_add_mmx()
James Almer [Thu, 25 Sep 2014 18:04:50 +0000 (15:04 -0300)]
x86/cavsdsp: fix buffer alignment in cavs_idct8_add_mmx()

It may be used by ff_add_pixels_clamped_sse2().
Should fix fate-cavs failures on some systems.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agolavu/ffmpeg_opt: Check return value of avcodec_find_encoder().
Thilo Borgmann [Thu, 25 Sep 2014 14:10:58 +0000 (16:10 +0200)]
lavu/ffmpeg_opt: Check return value of avcodec_find_encoder().

Prevents a segfault if a stream featuring a known but unavailable codec (like external lib codec) should be opened.

Bug found by: Jonas Geistert <j.geistert@yahoo.de>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/img2dec: enable generic seeking for image pipes
Michael Niedermayer [Thu, 25 Sep 2014 15:07:04 +0000 (17:07 +0200)]
avformat/img2dec: enable generic seeking for image pipes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/img2dec: initialize pkt->pos for image pipes
Michael Niedermayer [Thu, 25 Sep 2014 15:06:33 +0000 (17:06 +0200)]
avformat/img2dec: initialize pkt->pos for image pipes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/img2dec: pass error code and signal EOF
Michael Niedermayer [Thu, 25 Sep 2014 14:17:08 +0000 (16:17 +0200)]
avformat/img2dec: pass error code and signal EOF

Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/img2dec: fix error code at EOF for pipes
Michael Niedermayer [Thu, 25 Sep 2014 13:12:27 +0000 (15:12 +0200)]
avformat/img2dec: fix error code at EOF for pipes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4620affa24eedb167482198aa04126bcedd05620'
Michael Niedermayer [Thu, 25 Sep 2014 12:02:55 +0000 (14:02 +0200)]
Merge commit '4620affa24eedb167482198aa04126bcedd05620'

* commit '4620affa24eedb167482198aa04126bcedd05620':
  m4vdec: K&R formatting cosmetics

Conflicts:
libavformat/m4vdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5'
Michael Niedermayer [Thu, 25 Sep 2014 11:51:43 +0000 (13:51 +0200)]
Merge commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5'

* commit '86a361081d3eb4e999d75bc2a462f01d88cbd2e5':
  lmlm4: K&R formatting cosmetics

Conflicts:
libavformat/lmlm4.c

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

* commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b':
  concat: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '28f5cd312c9da9072108edf8b7685d009374ea96'
Michael Niedermayer [Thu, 25 Sep 2014 11:10:00 +0000 (13:10 +0200)]
Merge commit '28f5cd312c9da9072108edf8b7685d009374ea96'

* commit '28f5cd312c9da9072108edf8b7685d009374ea96':
  fate: Switch ra4-288 test from framecrc() to pcm()

Conflicts:
tests/fate/real.mak

The test is kept disabled as it still does not pass on x86-64 due to float
rounding

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d'
Michael Niedermayer [Thu, 25 Sep 2014 10:09:09 +0000 (12:09 +0200)]
Merge commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d'

* commit 'd07ddc93e29a4fdf12cd426953a7ecd5abe5e36d':
  avcodec: Fix a doxy comment to refer to the right function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agom4vdec: K&R formatting cosmetics
Gabriel Dume [Tue, 23 Sep 2014 14:29:59 +0000 (10:29 -0400)]
m4vdec: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agolmlm4: K&R formatting cosmetics
Gabriel Dume [Tue, 23 Sep 2014 14:29:58 +0000 (10:29 -0400)]
lmlm4: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoconcat: K&R formatting cosmetics
Gabriel Dume [Tue, 23 Sep 2014 14:29:57 +0000 (10:29 -0400)]
concat: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agofate: Switch ra4-288 test from framecrc() to pcm()
Katerina Barone-Adesi [Wed, 24 Sep 2014 11:51:54 +0000 (13:51 +0200)]
fate: Switch ra4-288 test from framecrc() to pcm()

The decoder is float-based and the test needs to allow for some fuzz.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoavcodec: Fix a doxy comment to refer to the right function
Martin Storsjö [Wed, 24 Sep 2014 20:31:43 +0000 (23:31 +0300)]
avcodec: Fix a doxy comment to refer to the right function

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavcodec/mpegvideo_enc: write a log message at verbose level if frame re-encoding...
Michael Niedermayer [Thu, 25 Sep 2014 02:28:21 +0000 (04:28 +0200)]
avcodec/mpegvideo_enc: write a log message at verbose level if frame re-encoding occurs due to VBV

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/idctdsp: port {put,add}_pixels_clamped to yasm
James Almer [Wed, 24 Sep 2014 22:53:07 +0000 (19:53 -0300)]
x86/idctdsp: port {put,add}_pixels_clamped to yasm

Also add sse2 versions for both.
put_pixels_clamped port and sse2 version originally written by Timothy Gu.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoavcodec/idctdsp: change {put,add}_pixels_clamped to ptrdiff_t line_size
James Almer [Wed, 24 Sep 2014 22:51:02 +0000 (19:51 -0300)]
avcodec/idctdsp: change {put,add}_pixels_clamped to ptrdiff_t line_size

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoMerge commit '2f172f1ae984b763c06069adb51d0053b3834f4b'
Michael Niedermayer [Wed, 24 Sep 2014 22:53:36 +0000 (00:53 +0200)]
Merge commit '2f172f1ae984b763c06069adb51d0053b3834f4b'

* commit '2f172f1ae984b763c06069adb51d0053b3834f4b':
  rtsp: Clear the session id on redirects

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc'
Michael Niedermayer [Wed, 24 Sep 2014 22:15:26 +0000 (00:15 +0200)]
Merge commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc'

* commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc':
  rtpenc: HEVC/H.265 support

Conflicts:
Changelog
libavformat/rtpenc.c
libavformat/rtpenc_hevc.c
libavformat/version.h

See: 6821a5a4adcb40c458356e8bb90416dd8f5dd6b2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95'
Michael Niedermayer [Wed, 24 Sep 2014 22:02:52 +0000 (00:02 +0200)]
Merge commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95'

* commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95':
  libavformat: Move avc mp4 startcode parsing to a shared file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86: use function pointers for {put,add}_pixels_clamped
James Almer [Wed, 24 Sep 2014 18:18:50 +0000 (15:18 -0300)]
avcodec/x86: use function pointers for {put,add}_pixels_clamped

Same behavior as in simple_idct.
This way the best optimized versions available will be used instead.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agolibavutil/opt: fix av_opt_set_channel_layout() to access correct memory address
Philip DeCamp [Wed, 24 Sep 2014 20:15:18 +0000 (16:15 -0400)]
libavutil/opt: fix av_opt_set_channel_layout() to access correct memory address

Signed-off-by: Philip DeCamp <decamp@mit.edu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortsp: Clear the session id on redirects
Martin Storsjö [Wed, 24 Sep 2014 08:31:18 +0000 (11:31 +0300)]
rtsp: Clear the session id on redirects

This fixes handling redirects in case the server provided a session
id within the redirect reply.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpenc: HEVC/H.265 support
Thomas Volkert [Sun, 21 Sep 2014 10:10:42 +0000 (12:10 +0200)]
rtpenc: HEVC/H.265 support

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolibavformat: Move avc mp4 startcode parsing to a shared file
Martin Storsjö [Wed, 24 Sep 2014 08:17:04 +0000 (11:17 +0300)]
libavformat: Move avc mp4 startcode parsing to a shared file

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agox86/videodsp: add ff_emu_edge_{hfix,hvar}_avx2
James Almer [Tue, 23 Sep 2014 21:42:35 +0000 (18:42 -0300)]
x86/videodsp: add ff_emu_edge_{hfix,hvar}_avx2

~15% faster than sse2.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agolibavformat/ffmetadec: Make unchanged function arguments const
Michael Niedermayer [Wed, 24 Sep 2014 16:33:55 +0000 (18:33 +0200)]
libavformat/ffmetadec: Make unchanged function arguments const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavformat/dv: Make unchanged function arguments const
Michael Niedermayer [Wed, 24 Sep 2014 16:33:55 +0000 (18:33 +0200)]
libavformat/dv: Make unchanged function arguments const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavformat/avienc: Make unchanged function arguments const
Michael Niedermayer [Wed, 24 Sep 2014 16:33:55 +0000 (18:33 +0200)]
libavformat/avienc: Make unchanged function arguments const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavformat/avidec: Make unchanged function arguments const
Michael Niedermayer [Wed, 24 Sep 2014 16:33:55 +0000 (18:33 +0200)]
libavformat/avidec: Make unchanged function arguments const

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c463dfc7e49929a9891884312b23b27d14729c51'
Michael Niedermayer [Wed, 24 Sep 2014 15:25:31 +0000 (17:25 +0200)]
Merge commit 'c463dfc7e49929a9891884312b23b27d14729c51'

* commit 'c463dfc7e49929a9891884312b23b27d14729c51':
  rtpdec_hevc: Drop a duplicated, nonstandard entry

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/APIchanges: fix typo
Michael Niedermayer [Wed, 24 Sep 2014 15:14:56 +0000 (17:14 +0200)]
doc/APIchanges: fix typo

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopostproc: add basic deblock filter visualization support
Michael Niedermayer [Fri, 19 Sep 2014 13:21:36 +0000 (15:21 +0200)]
postproc: add basic deblock filter visualization support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: use av_codec_get_pkt_timebase()
Michael Niedermayer [Wed, 24 Sep 2014 03:47:36 +0000 (05:47 +0200)]
ffplay: use av_codec_get_pkt_timebase()

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortpdec_hevc: Drop a duplicated, nonstandard entry
Vittorio Giovara [Wed, 17 Sep 2014 12:27:32 +0000 (13:27 +0100)]
rtpdec_hevc: Drop a duplicated, nonstandard entry

The RFC spec draft only specifies the "H265" name - there is no
specification saying how to interpret "HEVC" (if such a packet
format is specified it could be an entirely different format).

Since this is a very new standard (still a draft), there is little
need for compatibility with existing, broken implementations. Therefore
remove the extra alias, to avoid the risk of encouraging incorrect
usage.

Intentionally keeping the ff_hevc_dynamic_handler name for the
handler, to use "hevc" consistently as name for the codec instead
of "h265" within the library internals as long as there only is one
single variant in actual use.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoconfigure: Check if "-D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600" is needed for...
Michael Niedermayer [Wed, 24 Sep 2014 03:04:24 +0000 (05:04 +0200)]
configure: Check if "-D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600" is needed for localtime_r()

Fixes build with musl

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: fail if SDL is unavailable and --enable-sdl is specified
Michael Niedermayer [Tue, 23 Sep 2014 00:20:25 +0000 (02:20 +0200)]
configure: fail if SDL is unavailable and --enable-sdl is specified

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: reindent the --disable-sdl related code
Michael Niedermayer [Tue, 23 Sep 2014 00:08:55 +0000 (02:08 +0200)]
configure: reindent the --disable-sdl related code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: support --disable-sdl
Michael Niedermayer [Mon, 22 Sep 2014 20:13:22 +0000 (22:13 +0200)]
configure: support --disable-sdl

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: move intermediate bidir buffer
Christophe Gisquet [Tue, 23 Sep 2014 21:36:42 +0000 (21:36 +0000)]
hevc: move intermediate bidir buffer

Other buffers are already there.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: remove unneeded buffer.
Christophe Gisquet [Tue, 23 Sep 2014 21:36:40 +0000 (21:36 +0000)]
hevc: remove unneeded buffer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/videodsp: fix warning about discarded 'const' qualifier
James Almer [Tue, 23 Sep 2014 21:29:21 +0000 (18:29 -0300)]
x86/videodsp: fix warning about discarded 'const' qualifier

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoavcodec/libvpxdec: don't check for formats other than i420 when vp9 decoding is disabled
James Almer [Tue, 23 Sep 2014 22:30:58 +0000 (19:30 -0300)]
avcodec/libvpxdec: don't check for formats other than i420 when vp9 decoding is disabled

Should fix ticket #3958.

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
6 years agotests/fate-run.sh: Cat .err file in case of error with V>0
Michael Niedermayer [Tue, 23 Sep 2014 21:38:29 +0000 (23:38 +0200)]
tests/fate-run.sh: Cat .err file in case of error with V>0

This may make fate failures where only the console output is available
easier to analyze

Suggested-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoSkip decklink_common_c.h when running make checkheaders.
Carl Eugen Hoyos [Tue, 23 Sep 2014 20:51:36 +0000 (22:51 +0200)]
Skip decklink_common_c.h when running make checkheaders.