]> git.sesse.net Git - ffmpeg/log
ffmpeg
9 years agoMerge commit '254eb5b6faebb7bcfc3cefc1edced6652fe9d5be'
Michael Niedermayer [Sun, 31 May 2015 19:17:53 +0000 (21:17 +0200)]
Merge commit '254eb5b6faebb7bcfc3cefc1edced6652fe9d5be'

* commit '254eb5b6faebb7bcfc3cefc1edced6652fe9d5be':
  ppc: avutil: Drop a potentially dangerous workaround

See: 9564375deeaf22f8e8eaa4fcbc33115d104f7138
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/libquvi: fix error handling
Gilles Chanteperdrix [Wed, 8 Apr 2015 17:16:36 +0000 (19:16 +0200)]
avformat/libquvi: fix error handling

avoid calling cleanup functions on uninitialized variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_mpdecimate: add comment about 8x8 SAD
Peter Cordes [Wed, 4 Mar 2015 07:35:36 +0000 (03:35 -0400)]
avfilter/vf_mpdecimate: add comment about 8x8 SAD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_mpdecimate: support more pixel formats, including GBRP
Peter Cordes [Wed, 4 Mar 2015 07:35:36 +0000 (03:35 -0400)]
avfilter/vf_mpdecimate: support more pixel formats, including GBRP

Add some planar formats we can handle without distorting the meaning of
hi and lo.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_mpdecimate: debug logging of threshold stats
Peter Cordes [Tue, 3 Mar 2015 02:57:30 +0000 (22:57 -0400)]
avfilter/vf_mpdecimate: debug logging of threshold stats

It's often really helpful to know why a frame wasn't decimated (lo or
hi), and how much you exceeded the threshold by, if you're trying to
tweak the thresholds to get what you want.

mpdecimate already prints a line per input frame with -v debug, this
just makes it longer.

Signed-off-by: Peter Cordes <peter@cordes.ca>
9 years agoavfilter/vf_mpdecimate: pass the same AVClass context as use elsewhere to av_pixeluti...
Peter Cordes [Tue, 3 Mar 2015 02:57:08 +0000 (22:57 -0400)]
avfilter/vf_mpdecimate: pass the same AVClass context as use elsewhere to av_pixelutils_get_sad_fn()

Signed-off-by: Peter Cordes <peter@cordes.ca>
9 years agotests: add some ASS/SSA/MKS remux and transcode tests
Clément Bœsch [Mon, 25 May 2015 12:00:01 +0000 (14:00 +0200)]
tests: add some ASS/SSA/MKS remux and transcode tests

9 years agoppc: avutil: Drop a potentially dangerous workaround
Luca Barbato [Sun, 10 May 2015 20:48:30 +0000 (22:48 +0200)]
ppc: avutil: Drop a potentially dangerous workaround

The compiler is free to optimize such expressions in any sort of way.

9 years agoconfigure: Check for SecItemImport for securetransport as well
Rodger Combs [Sun, 31 May 2015 03:05:32 +0000 (22:05 -0500)]
configure: Check for SecItemImport for securetransport as well

This fixes the default build on iOS; eventually I should come up with
a better solution for that platform.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '881b80b3294483696a21b21a69fa5eee30f33037'
Michael Niedermayer [Sun, 31 May 2015 09:52:12 +0000 (11:52 +0200)]
Merge commit '881b80b3294483696a21b21a69fa5eee30f33037'

* commit '881b80b3294483696a21b21a69fa5eee30f33037':
  network: prevent SIGPIPE on OSX

See: c41e0aedf5fc2a92502bc400010e64b8fea89d4e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agonetwork: prevent SIGPIPE on OSX
wm4 [Thu, 28 May 2015 16:23:27 +0000 (18:23 +0200)]
network: prevent SIGPIPE on OSX

OSX does not know MSG_NOSIGNAL. BSD (which OSX is based on) has got
the socket option SO_NOSIGPIPE (even if modern BSDs also support
MSG_NOSIGNAL).

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoavfilter/vf_fade: Force alpha pixel format if alpha is set to 1
Michael Niedermayer [Wed, 27 May 2015 23:38:15 +0000 (01:38 +0200)]
avfilter/vf_fade: Force alpha pixel format if alpha is set to 1

Fixes Ticket4321

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/parser: Print an error in case of reallocation fails in ff_combine_frame()
Michael Niedermayer [Sun, 31 May 2015 00:59:06 +0000 (02:59 +0200)]
avcodec/parser: Print an error in case of reallocation fails in ff_combine_frame()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopostproc: Avoid floats in maxClipped computation
Michael Niedermayer [Sat, 30 May 2015 23:40:12 +0000 (01:40 +0200)]
postproc: Avoid floats in maxClipped computation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopostproc/postprocess_template: Compute packedYScale and QPCorrecture without floats
Michael Niedermayer [Sat, 30 May 2015 22:50:45 +0000 (00:50 +0200)]
postproc/postprocess_template: Compute packedYScale and QPCorrecture without floats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agonetwork: prevent SIGPIPE on OSX
wm4 [Sat, 30 May 2015 18:50:43 +0000 (20:50 +0200)]
network: prevent SIGPIPE on OSX

OSX does not know MSG_NOSIGNAL, and provides its own non-standard
mechanism instead. I guess Apple hates standards.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '0181ae9af2de1526464d23209b82e6674d362f5d'
Michael Niedermayer [Sat, 30 May 2015 19:33:00 +0000 (21:33 +0200)]
Merge commit '0181ae9af2de1526464d23209b82e6674d362f5d'

* commit '0181ae9af2de1526464d23209b82e6674d362f5d':
  h264: Make sure reinit failures mark the context as not initialized

Conflicts:
libavcodec/h264_slice.c

See: e8714f6f93d1a32f4e4655209960afcf4c185214
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '5ecabd3c54b7c802522dc338838c9a4c2dc42948'
Michael Niedermayer [Sat, 30 May 2015 19:03:16 +0000 (21:03 +0200)]
Merge commit '5ecabd3c54b7c802522dc338838c9a4c2dc42948'

* commit '5ecabd3c54b7c802522dc338838c9a4c2dc42948':
  msrle: Use FFABS to determine the frame size in msrle_decode_pal4

Conflicts:
libavcodec/msrledec.c

See: f7e1367f58263593e6cee3c282f7277d7ee9d553
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibopenjpegdec: check existence of image component data
Andreas Cadhalpun [Sat, 30 May 2015 14:18:48 +0000 (16:18 +0200)]
libopenjpegdec: check existence of image component data

libopenjpeg can return images with components without data.

This fixes segmentation faults.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
9 years agodoc/ffmpeg: Document xerror
Michael Niedermayer [Sat, 30 May 2015 16:32:00 +0000 (18:32 +0200)]
doc/ffmpeg: Document xerror

Previous version reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/movenc: Add loction/xyz support to allow copying data between mov files
Michael Niedermayer [Sat, 30 May 2015 13:32:40 +0000 (15:32 +0200)]
avformat/movenc: Add loction/xyz support to allow copying data between mov files

Fixes Ticket4337

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoh264: Make sure reinit failures mark the context as not initialized
Luca Barbato [Mon, 25 May 2015 20:30:10 +0000 (22:30 +0200)]
h264: Make sure reinit failures mark the context as not initialized

Bug-Id: CVE-2015-3417
CC: libav-stable@libav.org
9 years agomsrle: Use FFABS to determine the frame size in msrle_decode_pal4
Luca Barbato [Mon, 25 May 2015 19:53:26 +0000 (21:53 +0200)]
msrle: Use FFABS to determine the frame size in msrle_decode_pal4

As done in msrle_decode_8_16_24_32.

Bug-Id: CVE-2015-3395
CC: libav-stable@libav.org
9 years agoavformat/mov: Also export loci altitude
Michael Niedermayer [Sat, 30 May 2015 13:28:31 +0000 (15:28 +0200)]
avformat/mov: Also export loci altitude

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/mov: Append place name instead of overwriting for loci
Michael Niedermayer [Sat, 30 May 2015 13:23:19 +0000 (15:23 +0200)]
avformat/mov: Append place name instead of overwriting for loci

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf/tls_securetransport: add missing copyright notice
Rodger Combs [Sat, 30 May 2015 07:12:49 +0000 (02:12 -0500)]
lavf/tls_securetransport: add missing copyright notice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/dvbsubdec: Fix buf_size check in dvbsub_parse_display_definition_segment()
banastasov [Sat, 30 May 2015 02:28:39 +0000 (04:28 +0200)]
avcodec/dvbsubdec: Fix buf_size check in dvbsub_parse_display_definition_segment()

Fixes Ticket4326

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/h264dec: Add ff_tlog() with trace information about h264 probing
Michael Niedermayer [Sat, 30 May 2015 01:57:20 +0000 (03:57 +0200)]
avformat/h264dec: Add ff_tlog() with trace information about h264 probing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/h264dec: Fix detection of invalid h264 with 0x100 startcodes
Michael Niedermayer [Sat, 30 May 2015 01:53:32 +0000 (03:53 +0200)]
avformat/h264dec: Fix detection of invalid h264 with 0x100 startcodes

Fies Ticket4325

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'b2f0f37d242f1194fe1f886557cf6cefdf98caf6'
Michael Niedermayer [Fri, 29 May 2015 22:59:54 +0000 (00:59 +0200)]
Merge commit 'b2f0f37d242f1194fe1f886557cf6cefdf98caf6'

* commit 'b2f0f37d242f1194fe1f886557cf6cefdf98caf6':
  rtmpdh: Generate the whole private exponent using av_get_random_seed() with nettle/gmp

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agortmpdh: Generate the whole private exponent using av_get_random_seed() with nettle/gmp
Martin Storsjö [Fri, 29 May 2015 07:14:39 +0000 (10:14 +0300)]
rtmpdh: Generate the whole private exponent using av_get_random_seed() with nettle/gmp

Don't use a PRNG for generating it; that defies the intended use
within the cryptograhic handshake.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agolavf/tls: Support Secure Transport
Rodger Combs [Thu, 28 May 2015 19:46:16 +0000 (14:46 -0500)]
lavf/tls: Support Secure Transport

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoconfigure: Fix showcqt fft dependancy
Michael Niedermayer [Fri, 29 May 2015 19:07:58 +0000 (21:07 +0200)]
configure: Fix showcqt fft dependancy

Found-by: Muhammad Faiz <mfcc64@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agobuild: add configure option pkgconfigdir
Ingo Brückl [Fri, 29 May 2015 14:08:36 +0000 (16:08 +0200)]
build: add configure option pkgconfigdir

This allows the user to override the directory for the installation
of the pkg-config files (from the default LIBDIR/pkgconfig).

It follows the usual behaviour of Makefiles generated by automake.

Signed-off-by: Ingo Brückl <ib@wupperonline.de>
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavutil: Cosmetic changes to fixed_dsp file.
Nedeljko Babic [Fri, 29 May 2015 13:46:20 +0000 (15:46 +0200)]
libavutil: Cosmetic changes to fixed_dsp file.

Names of functions vector_fmul_window_fixed_c and
vector_fmul_window_fixed_scaled_c are changed by removing "_fixed"
from the name since it is redundant.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomov: fix DTS calculation for samples with negative stts duration
Andreas Cadhalpun [Wed, 27 May 2015 21:57:50 +0000 (23:57 +0200)]
mov: fix DTS calculation for samples with negative stts duration

A negative sample duration is invalid according to the spec, but there
are samples that use it for the DTS calculation, e.g.:
http://files.1f0.de/samples/mp4-negative-stts-problem.mp4

These currently get out of A/V sync.

Also change the logging type to AV_LOG_WARNING, because decoding the
sample can continue.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
9 years agoavcodec/mpegvideo: Use FFSWAP to exchange pointers
Michael Niedermayer [Fri, 29 May 2015 12:03:07 +0000 (14:03 +0200)]
avcodec/mpegvideo: Use FFSWAP to exchange pointers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/ac3_parser: Avoid floats in bitrate computation
Michael Niedermayer [Fri, 29 May 2015 10:59:35 +0000 (12:59 +0200)]
avcodec/ac3_parser: Avoid floats in bitrate computation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/movenc: Check that track_width_1616 fits within the available 32bit before...
Michael Niedermayer [Fri, 29 May 2015 10:54:37 +0000 (12:54 +0200)]
avformat/movenc: Check that track_width_1616 fits within the available 32bit before storing it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/movenc: avoid floats in width/height/aspect ratio computations
Michael Niedermayer [Fri, 29 May 2015 10:36:55 +0000 (12:36 +0200)]
avformat/movenc: avoid floats in width/height/aspect ratio computations

This avoids the possibility for rounding/precision differences between platforms

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/concatdec: Enable auto_convert by default
Michael Niedermayer [Tue, 26 May 2015 20:16:43 +0000 (22:16 +0200)]
avformat/concatdec: Enable auto_convert by default

Users have no means to find out from a failure how to make it work
or is it preferred to check and print a warning for h264 concat without auto_convert ?

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/mov: Avoid float usage in yuv_to_rgba()
Michael Niedermayer [Fri, 29 May 2015 10:06:51 +0000 (12:06 +0200)]
avformat/mov: Avoid float usage in yuv_to_rgba()

This avoids the possibility for rounding/precision differences between platforms

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1'
Michael Niedermayer [Fri, 29 May 2015 09:42:38 +0000 (11:42 +0200)]
Merge commit 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1'

* commit 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1':
  rtmpdh: Create sufficiently long private keys for gcrypt/nettle

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '8016a1bd3b60e917e1b12748dd80c06c3462c286'
Michael Niedermayer [Fri, 29 May 2015 09:42:17 +0000 (11:42 +0200)]
Merge commit '8016a1bd3b60e917e1b12748dd80c06c3462c286'

* commit '8016a1bd3b60e917e1b12748dd80c06c3462c286':
  rtmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_key

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53'
Michael Niedermayer [Fri, 29 May 2015 09:38:26 +0000 (11:38 +0200)]
Merge commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53'

* commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53':
  rtmpdh: Add fate test for the DH handshake routine

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4'
Michael Niedermayer [Fri, 29 May 2015 09:31:55 +0000 (11:31 +0200)]
Merge commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4'

* commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4':
  rtmpdh: Pass the actual buffer size of the output secret key

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b'
Michael Niedermayer [Fri, 29 May 2015 09:31:38 +0000 (11:31 +0200)]
Merge commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b'

* commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b':
  rtmpdh: Check the output buffer size in the openssl version of dh_compute_key

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '127d813bcb5705202b7100cf1eccd1e26d72ba14'
Michael Niedermayer [Fri, 29 May 2015 09:31:22 +0000 (11:31 +0200)]
Merge commit '127d813bcb5705202b7100cf1eccd1e26d72ba14'

* commit '127d813bcb5705202b7100cf1eccd1e26d72ba14':
  rtmpdh: Fix a local variable name in the nettle/gcrypt codepath

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '78efc69e7c990226f4b913721ef1b308ca5bfa04'
Michael Niedermayer [Fri, 29 May 2015 09:21:26 +0000 (11:21 +0200)]
Merge commit '78efc69e7c990226f4b913721ef1b308ca5bfa04'

* commit '78efc69e7c990226f4b913721ef1b308ca5bfa04':
  rtmpdh: Make sure ret is initialized in the nettle version of bn_hex2bn

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agortmpdh: Create sufficiently long private keys for gcrypt/nettle
Martin Storsjö [Thu, 28 May 2015 08:42:44 +0000 (11:42 +0300)]
rtmpdh: Create sufficiently long private keys for gcrypt/nettle

There was a misunderstanding betewen bits and bytes for the parameter
value for generating random big numbers.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_key
Martin Storsjö [Thu, 28 May 2015 08:39:45 +0000 (11:39 +0300)]
rtmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_key

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortmpdh: Add fate test for the DH handshake routine
Martin Storsjö [Thu, 28 May 2015 07:54:11 +0000 (10:54 +0300)]
rtmpdh: Add fate test for the DH handshake routine

This helps if these functions need to be implemented using another
crypto API.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortmpdh: Pass the actual buffer size of the output secret key
Martin Storsjö [Thu, 28 May 2015 07:11:27 +0000 (10:11 +0300)]
rtmpdh: Pass the actual buffer size of the output secret key

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortmpdh: Check the output buffer size in the openssl version of dh_compute_key
Martin Storsjö [Thu, 28 May 2015 07:08:27 +0000 (10:08 +0300)]
rtmpdh: Check the output buffer size in the openssl version of dh_compute_key

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortmpdh: Fix a local variable name in the nettle/gcrypt codepath
Martin Storsjö [Thu, 28 May 2015 07:03:39 +0000 (10:03 +0300)]
rtmpdh: Fix a local variable name in the nettle/gcrypt codepath

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortmpdh: Make sure ret is initialized in the nettle version of bn_hex2bn
Martin Storsjö [Thu, 28 May 2015 06:47:44 +0000 (09:47 +0300)]
rtmpdh: Make sure ret is initialized in the nettle version of bn_hex2bn

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agodxva2_hevc: re-write reference frame handling
Hendrik Leppkes [Thu, 28 May 2015 16:20:25 +0000 (18:20 +0200)]
dxva2_hevc: re-write reference frame handling

The old logic required and explicit clearing of the lists first and was
prone to overflow the DXVA2 struct in some circumstances.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodxva2_hevc: fix 32x32 scaling lists
Hendrik Leppkes [Thu, 28 May 2015 16:20:24 +0000 (18:20 +0200)]
dxva2_hevc: fix 32x32 scaling lists

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/mpegvideo: Reset bitstream_buffer_size on allocation failure
Michael Niedermayer [Thu, 28 May 2015 22:33:18 +0000 (00:33 +0200)]
avcodec/mpegvideo: Reset bitstream_buffer_size on allocation failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/mpegvideo: Check pointer when allocation fail
Roman Savchenko [Thu, 28 May 2015 15:25:57 +0000 (18:25 +0300)]
avcodec/mpegvideo: Check pointer when allocation fail

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/avienc: Correct possible dereference of null
Roman Savchenko [Thu, 28 May 2015 15:25:56 +0000 (18:25 +0300)]
avformat/avienc: Correct possible dereference of null

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'a64a5773ea5f7337cd1d87cfdf511914d317fe81'
Michael Niedermayer [Thu, 28 May 2015 20:24:12 +0000 (22:24 +0200)]
Merge commit 'a64a5773ea5f7337cd1d87cfdf511914d317fe81'

* commit 'a64a5773ea5f7337cd1d87cfdf511914d317fe81':
  pixfmt: remove misleading and broken documentation

Conflicts:
libavutil/pixfmt.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'e4610300de6869bd6b3b00e76cfeabb6d7653dcd'
Michael Niedermayer [Thu, 28 May 2015 20:11:42 +0000 (22:11 +0200)]
Merge commit 'e4610300de6869bd6b3b00e76cfeabb6d7653dcd'

* commit 'e4610300de6869bd6b3b00e76cfeabb6d7653dcd':
  x86: cavs: Remove an unneeded scratch buffer

Conflicts:
libavcodec/x86/cavsdsp.c

See: d79f7bf0d63a81ee66026ee92a6946a7303d04bd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1'
Michael Niedermayer [Thu, 28 May 2015 20:02:41 +0000 (22:02 +0200)]
Merge commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1'

* commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1':
  rl: Add error checking to ff_rl_init().

Conflicts:
libavcodec/rl.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '324e50ee95929a9491b855c5e15451145bd5d1ec'
Michael Niedermayer [Thu, 28 May 2015 19:55:17 +0000 (21:55 +0200)]
Merge commit '324e50ee95929a9491b855c5e15451145bd5d1ec'

* commit '324e50ee95929a9491b855c5e15451145bd5d1ec':
  rl: Add a function for freeing dynamically allocated tables.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '6f57375d707de40dcec28d3cef886c364e032c21'
Michael Niedermayer [Thu, 28 May 2015 19:48:49 +0000 (21:48 +0200)]
Merge commit '6f57375d707de40dcec28d3cef886c364e032c21'

* commit '6f57375d707de40dcec28d3cef886c364e032c21':
  rl: Rename ff_*_rl() to ff_rl_*()

Conflicts:
libavcodec/mpeg4videodec.c
libavcodec/rl.c
libavcodec/rl.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'fa1923f18205410a3b0aa6c0e77cb31443ef340d'
Michael Niedermayer [Thu, 28 May 2015 19:36:31 +0000 (21:36 +0200)]
Merge commit 'fa1923f18205410a3b0aa6c0e77cb31443ef340d'

* commit 'fa1923f18205410a3b0aa6c0e77cb31443ef340d':
  mpegvideo: Move ff_*_rl functions to a separate file

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '419e3404d07acaac019e8f363c281e17c3a3d622'
Michael Niedermayer [Thu, 28 May 2015 19:28:04 +0000 (21:28 +0200)]
Merge commit '419e3404d07acaac019e8f363c281e17c3a3d622'

* commit '419e3404d07acaac019e8f363c281e17c3a3d622':
  mpegvideo: Drop exchange_uv() function and use its code directly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1'
Michael Niedermayer [Thu, 28 May 2015 19:20:37 +0000 (21:20 +0200)]
Merge commit 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1'

* commit 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1':
  tls_gnutls: Add missing includes for the gcrypt thread safety callbacks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'dd4d709be705edaec0bc35c426bf8434e942b7df'
Michael Niedermayer [Thu, 28 May 2015 19:12:25 +0000 (21:12 +0200)]
Merge commit 'dd4d709be705edaec0bc35c426bf8434e942b7df'

* commit 'dd4d709be705edaec0bc35c426bf8434e942b7df':
  x86inc: Clear __SECT__

See: 204b228a1d884343dbd974e6326a06901736b3b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/mips/hevcdsp_msa: Restructure as per avutil/mips/generic_macros_msa.h
Shivraj Patil [Thu, 28 May 2015 14:44:42 +0000 (20:14 +0530)]
avcodec/mips/hevcdsp_msa: Restructure as per avutil/mips/generic_macros_msa.h

This patch modifies HEVC mc MIPS-SIMD optimized code according to improved version of generic macros.

Overall, this patch is just upgrading the code with styling changes and will bring it in sync with MIPS-SIMD optimized latest codebase at our end.

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopixfmt: remove misleading and broken documentation
wm4 [Thu, 28 May 2015 14:26:20 +0000 (16:26 +0200)]
pixfmt: remove misleading and broken documentation

This was probably broken some time ago. The breakage is now part of the
ABI. For example, we have:

    AV_PIX_FMT_XYZ12BE
    AV_PIX_FMT_NV16
    AV_PIX_FMT_NV20LE

AV_PIX_FMT_NV20LE is wrong. It has the value 113, but as little-endian
format it should be even. This must have been quite obvious when these
formats were added (because of the AV_PIX_FMT_XYZ12BE entry), but
nobody cared or knew about this.

The future libavutil major bump will also break this additionally,
because disabling FF_API_VDPAU will remove an odd number of entries from
the middle of the enum.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agox86: cavs: Remove an unneeded scratch buffer
Michael Niedermayer [Thu, 28 May 2015 10:38:35 +0000 (12:38 +0200)]
x86: cavs: Remove an unneeded scratch buffer

Simplifies the code and makes it build on certain compilers
running out of registers on x86.

CC: libav-stable@libav.org
Reported-By: mudler
9 years agoavcodec/mips: Split uni mc optimizations to new file
Shivraj Patil [Thu, 28 May 2015 14:40:58 +0000 (20:10 +0530)]
avcodec/mips: Split uni mc optimizations to new file

This patch moves HEVC code of uni mc cases to new file hevc_mc_uni_msa.c.
(There are total 5 sub-modules of HEVC mc functions, if we add all these modules in one single file, its size would be huge (~750k) & difficult to maintain, so splitting it in multiple files)
This patch also adds new HEVC header file libavcodec/mips/hevc_macros_msa.h

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agorl: Add error checking to ff_rl_init().
Anton Khirnov [Fri, 22 May 2015 18:50:14 +0000 (19:50 +0100)]
rl: Add error checking to ff_rl_init().

9 years agorl: Add a function for freeing dynamically allocated tables.
Anton Khirnov [Fri, 22 May 2015 18:50:13 +0000 (19:50 +0100)]
rl: Add a function for freeing dynamically allocated tables.

Such tables are not used anywhere currently, but that should change.

9 years agorl: Rename ff_*_rl() to ff_rl_*()
Anton Khirnov [Fri, 22 May 2015 18:50:12 +0000 (19:50 +0100)]
rl: Rename ff_*_rl() to ff_rl_*()

9 years agompegvideo: Move ff_*_rl functions to a separate file
Anton Khirnov [Fri, 22 May 2015 18:50:11 +0000 (19:50 +0100)]
mpegvideo: Move ff_*_rl functions to a separate file

9 years agompegvideo: Drop exchange_uv() function and use its code directly
Vittorio Giovara [Fri, 22 May 2015 18:50:10 +0000 (19:50 +0100)]
mpegvideo: Drop exchange_uv() function and use its code directly

Code is small enough that there is no advantage in a separate function.

9 years agodvdsubdec: implement flushing
wm4 [Thu, 28 May 2015 12:16:36 +0000 (14:16 +0200)]
dvdsubdec: implement flushing

This is needed for proper operation with seeking.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodvdsubdec: reset buffer size on invalid over-large packets
wm4 [Thu, 28 May 2015 12:30:14 +0000 (14:30 +0200)]
dvdsubdec: reset buffer size on invalid over-large packets

Otherwise it will never be reset, and remain "stuck" in this state
forever. Can happen when seeking: the decoder will receive fragments
from different file positions, which triggers the condition easily.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Thu, 28 May 2015 12:12:42 +0000 (14:12 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavc/x264: Support bgr0 as input pix_fmt.
  lavf: Use av_codec_get_tag2() in avformat_query_codec().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agotls_gnutls: Add missing includes for the gcrypt thread safety callbacks
Martin Storsjö [Thu, 28 May 2015 07:18:49 +0000 (10:18 +0300)]
tls_gnutls: Add missing includes for the gcrypt thread safety callbacks

This fixes building with gcrypt-backed gnutls versions, broken
in 57cde2b180.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoavformat/mxfenc: Support storing signal standard for D10 muxing
Michael Niedermayer [Sun, 24 May 2015 00:43:26 +0000 (02:43 +0200)]
avformat/mxfenc: Support storing signal standard for D10 muxing

Reviewed-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavc/x264: Support bgr0 as input pix_fmt.
Carl Eugen Hoyos [Thu, 28 May 2015 10:34:22 +0000 (12:34 +0200)]
lavc/x264: Support bgr0 as input pix_fmt.

9 years agolavf: Use av_codec_get_tag2() in avformat_query_codec().
Carl Eugen Hoyos [Thu, 28 May 2015 10:31:40 +0000 (12:31 +0200)]
lavf: Use av_codec_get_tag2() in avformat_query_codec().

av_codec_get_tag() can return 0 both in case of error and success.

9 years agoavcodec/mips: Restructure as per avutil/mips/generic_macros_msa.h
Shivraj Patil [Thu, 28 May 2015 09:13:25 +0000 (14:43 +0530)]
avcodec/mips: Restructure as per avutil/mips/generic_macros_msa.h

This patch modifies H264 loopfilter, weighted & bi-weighted prediction MIPS-SIMD optimized code according to improved version of generic macros.
Also there are minor code alignment changes.

Overall, this patch is just upgrading the code with styling changes and will bring it in sync with MIPS-SIMD optimized latest codebase at our end.

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agox86inc: Clear __SECT__
Timothy Gu [Mon, 25 May 2015 23:00:43 +0000 (16:00 -0700)]
x86inc: Clear __SECT__

Silences warning(s) like:

    libavcodec/x86/fft.asm:93: warning: section flags ignored on
    section redeclaration

The cause of this warning is that because `struc` and `endstruc`
attempts to revert to the previous section state [1].

The section state is stored in the macro __SECT__, defined by
x86inc.asm to be `.note.GNU-stack ...`, through the `SECTION`
directive [2].

Thus, the `.note.GNU-stack` section is defined twice
(once in x86inc.asm, once during `endstruc`), causing the warning.

That is the first part of the commit: using the primitive `[section]` format
for .note.GNU-stack etc., which does not update `__SECT__` [2].

That fixes only half of the problem. Even without any `SECTION` directives,
`__SECT__` is predefined as `.text`, which conflicting with the later
`SECTION_TEXT` (which expands to `.text align=16`).

[1]: http://www.nasm.us/doc/nasmdoc6.html#section-6.4
[2]: http://www.nasm.us/doc/nasmdoc6.html#section-6.3

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agoavutil/mips: Restructure of generic macros
Shivraj Patil [Thu, 28 May 2015 09:06:53 +0000 (14:36 +0530)]
avutil/mips: Restructure of generic macros

This patch includes restructuring of existing macros and addition of more generic macros.

This change was necessary to avoid repeated review comments in remaining patches which we were about to submit.
Also this patch reduces number of code lines due to maximum use of generic macros, allows better code alignment & readability etc.

These modifications in commonly used .libavutil/mips/generic_macros_msa.h. impacts the already accepted code, hence re-submitting it in 2/4,3/4 & 4/4.
Overall, this patch set is just upgrading the code with styling changes and will bring it in sync with MIPS-SIMD optimized latest codebase at our end.

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agonetwork: Move variable declaration under an #if
Timothy Gu [Wed, 27 May 2015 23:39:55 +0000 (16:39 -0700)]
network: Move variable declaration under an #if

Avoids an unused variable warning.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/ffv1dec: Fix skip_alpha
Michael Niedermayer [Wed, 27 May 2015 23:01:16 +0000 (01:01 +0200)]
avcodec/ffv1dec: Fix skip_alpha

Fixes Ticket4322

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agox86inc: Clear __SECT__
Timothy Gu [Mon, 25 May 2015 23:02:33 +0000 (16:02 -0700)]
x86inc: Clear __SECT__

This commit silences warning(s) like:

    libavcodec/x86/fft.asm:93: warning: section flags ignored on section
    redeclaration

The cause of this warning is that because `struc` and `endstruc` attempts to
revert to the previous section state [1]. The section state is stored in the
macro __SECT__, defined by x86inc.asm to be `.note.GNU-stack ...`, through the
`SECTION` directive [2].  Thus, the `.note.GNU-stack` section is defined twice
(once in x86inc.asm, once during `endstruc`), causing the warning.

That is the first part of the commit: using the primitive `[section]` format
for .note.GNU-stack etc., which does not update `__SECT__` [2].

That fixes only half of the problem. Even without any `SECTION` directives,
`__SECT__` is predefined as `.text`, which conflicting with the later
`SECTION_TEXT` (which expands to `.text align=16`).

[1]: http://www.nasm.us/doc/nasmdoc6.html#section-6.4
[2]: http://www.nasm.us/doc/nasmdoc6.html#section-6.3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRevert "Move struc FFTContext below SECTION_RODATA"
Timothy Gu [Mon, 25 May 2015 23:02:32 +0000 (16:02 -0700)]
Revert "Move struc FFTContext below SECTION_RODATA"

This reverts commit 599888a48040f4086c9086aae958b7231b37afcc.

The commit does not silence the warning on ELF-based systems, and will be
fixed in the subsequent commit.

Conflicts:
libavcodec/x86/fft_mmx.asm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '57cde2b180fcec0eaf60aad65f436ab6420546f5'
Michael Niedermayer [Wed, 27 May 2015 20:37:05 +0000 (22:37 +0200)]
Merge commit '57cde2b180fcec0eaf60aad65f436ab6420546f5'

* commit '57cde2b180fcec0eaf60aad65f436ab6420546f5':
  lavf: move TLS-related ifdeffery to library specific files

Conflicts:
libavformat/network.c
libavformat/tls.h
libavformat/tls_openssl.c

See: a9f1d584e53fb39d983201585cb136986a85cac8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf: move TLS-related ifdeffery to library specific files
wm4 [Wed, 27 May 2015 10:57:51 +0000 (12:57 +0200)]
lavf: move TLS-related ifdeffery to library specific files

There is no need to have this mess in network.c.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'd8ffb2055f0e0fcb5d025bab72eb19c2a886c125'
Michael Niedermayer [Wed, 27 May 2015 20:17:04 +0000 (22:17 +0200)]
Merge commit 'd8ffb2055f0e0fcb5d025bab72eb19c2a886c125'

* commit 'd8ffb2055f0e0fcb5d025bab72eb19c2a886c125':
  lavf: split tls.c

Conflicts:
libavformat/tls.c
libavformat/tls_gnutls.c
libavformat/tls_openssl.c

See: 4a006b9eb7e7d736fd00e6045b5612978ef6404b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf: split tls.c
wm4 [Wed, 27 May 2015 10:57:50 +0000 (12:57 +0200)]
lavf: split tls.c

Move the OpenSSL and GnuTLS implementations to their own files. Other
than the connection code (including options) and some boilerplate, no
code is actually shared.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/mpsubdec: Use double instead of float for timestamp calculations
Michael Niedermayer [Wed, 27 May 2015 13:25:28 +0000 (15:25 +0200)]
avformat/mpsubdec: Use double instead of float for timestamp calculations

This provides higher precission

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/mp3dec: Ensure the buffer is large enough to avoid seeks from the first...
Michael Niedermayer [Wed, 27 May 2015 14:18:31 +0000 (16:18 +0200)]
avformat/mp3dec: Ensure the buffer is large enough to avoid seeks from the first frame search

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/mp3: skip junk at the beginning of mp3 files
wm4 [Wed, 27 May 2015 12:48:10 +0000 (14:48 +0200)]
avformat/mp3: skip junk at the beginning of mp3 files

Apparently it can happen that a mp3 file has junk data between id3 tag
and actual mp3 data. Skip this to avoid outputting nonsense timestamps.
(Two packets had the same timestamps, because the mp3 parser failed to
compute a frame duration.)

In this case, the junk consisted of 1044 bytes of zero, which
incidentally is the same size as normal mp3 frames in this stream. I
suspect the mp3 was edited with some tool which wiped the Xing/LAME
headers. Data near the end of the file suggests it was encoded with
"LAME3.97", but the normal Xing/LAME headers are missing. So this could
be "normal". mpg123 also attempts to skip at least 64KB of junk data by
scanning for headers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>