]> git.sesse.net Git - ffmpeg/log
ffmpeg
9 years agoh264: make sure the current picture is not made a long ref multiple times
Anton Khirnov [Fri, 8 May 2015 17:07:10 +0000 (19:07 +0200)]
h264: make sure the current picture is not made a long ref multiple times

Fixes possible invalid reads, once one of those refs is freed, but the
others remain.
CC: libav-stable@libav.org
9 years agoavconv: do not stop processing the input packet on decoding error
Anton Khirnov [Wed, 6 May 2015 11:55:38 +0000 (13:55 +0200)]
avconv: do not stop processing the input packet on decoding error

We still want to flush the filters on EOF and possibly apply streamcopy.

9 years agoavconv: factor out flushing the filters
Anton Khirnov [Wed, 6 May 2015 11:51:43 +0000 (13:51 +0200)]
avconv: factor out flushing the filters

This also ensures this is always done, avoiding infinite loops if an
error occurs at the end of the input.

9 years agoh264: make sure the slices do not overlap during slice threading
Anton Khirnov [Wed, 6 May 2015 09:12:55 +0000 (11:12 +0200)]
h264: make sure the slices do not overlap during slice threading

Based on a patch by Michael Niedermayer <michaelni@gmx.at>.
CC: libav-stable@libav.org
Found-by: Kieran Kunhya <kierank@obe.tv>
9 years agoavcodec/jpeg2000dec: Check for mismatching per expected termination
Michael Niedermayer [Sat, 27 Jun 2015 13:12:35 +0000 (15:12 +0200)]
avcodec/jpeg2000dec: Check for mismatching per expected termination

not just at the end

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf/brstm: if the file lies about the last block's size, correct it
Rodger Combs [Tue, 23 Jun 2015 17:35:35 +0000 (12:35 -0500)]
lavf/brstm: if the file lies about the last block's size, correct it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoconfigure: Check for x265_api_get
Derek Buitenhuis [Fri, 26 Jun 2015 13:05:00 +0000 (14:05 +0100)]
configure: Check for x265_api_get

Any other x265 symbol may not exported, e.g. if the build is a
multilib (10-bit and 8-bit in one) build.

This is the only symbol we directly call, and is available in the
build number we check for.

Fixes the configure check on multilib x265 builds.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years agoconfigure: Check for x265_api_get
Derek Buitenhuis [Fri, 26 Jun 2015 13:05:00 +0000 (14:05 +0100)]
configure: Check for x265_api_get

Any other x265 symbol may not exported, e.g. if the build is a
multilib (10-bit and 8-bit in one) build.

This is the only symbol we directly call, and is available in the
build number we check for.

Fixes the configure check on multilib x265 builds.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
9 years agoavcodec/jpeg2000dec: Limit poc end fields to whats available in jpeg2000_decode_packets()
Michael Niedermayer [Sat, 27 Jun 2015 09:48:42 +0000 (11:48 +0200)]
avcodec/jpeg2000dec: Limit poc end fields to whats available in jpeg2000_decode_packets()

Fixes: Ticket4677
Solution based on information from
https://code.google.com/p/openjpeg/issues/detail?id=80

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/utils: Replace ENOTSUP by AVERROR_PATCHWELCOME
Michael Niedermayer [Sat, 27 Jun 2015 09:19:57 +0000 (11:19 +0200)]
avcodec/utils: Replace ENOTSUP by AVERROR_PATCHWELCOME

ENOTSUP is not available on all platforms

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec: Add flag for experimental HWAccels and use it for VDPAU/HEVC
Philip Langdale [Fri, 26 Jun 2015 15:43:41 +0000 (08:43 -0700)]
avcodec: Add flag for experimental HWAccels and use it for VDPAU/HEVC

This HWAccel isn't really usable right now due to an nvidia driver bug,
so we don't want it selected by default.

HWAccels have a capabilities field and there's a comment about flags,
but no flags exist today, so let's add one for experimental hwaccels.

9 years agofate/api-tests: Move api-flac-test to API tests directory.
George Boyle [Thu, 25 Jun 2015 17:37:11 +0000 (18:37 +0100)]
fate/api-tests: Move api-flac-test to API tests directory.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofate/api-tests: Add directory and Makefile for API tests
George Boyle [Thu, 25 Jun 2015 17:37:10 +0000 (18:37 +0100)]
fate/api-tests: Add directory and Makefile for API tests

The intention of this change is to allow separation of API tests from the
existing tests, and also to have a place for the API test source/executable
files so they're not mixed in with the actual library code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '92fdc80cab2acad9f171ba38a08aa89b392bdadd'
Michael Niedermayer [Fri, 26 Jun 2015 21:58:51 +0000 (23:58 +0200)]
Merge commit '92fdc80cab2acad9f171ba38a08aa89b392bdadd'

* commit '92fdc80cab2acad9f171ba38a08aa89b392bdadd':
  nvenc: Fix NV12 input

Conflicts:
libavcodec/nvenc.c

Not merged, the changed code is not in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '072756cdd2f949462520041e357f52f15d8c274d'
Michael Niedermayer [Fri, 26 Jun 2015 21:35:42 +0000 (23:35 +0200)]
Merge commit '072756cdd2f949462520041e357f52f15d8c274d'

* commit '072756cdd2f949462520041e357f52f15d8c274d':
  vc1dec: use get_bits_long and limit the read bits to 32

See: 1f1e0a2971b2a01f275bb5088c2e36166514be64
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agos302m: fix arithmetic exception
Andreas Cadhalpun [Fri, 26 Jun 2015 17:31:03 +0000 (19:31 +0200)]
s302m: fix arithmetic exception

If nb_samples is zero, the bit_rate calculation results in a division by
zero.

Since ff_get_buffer fails if frame->nb_samples is zero, this can be
fixed by moving the bit_rate calculation after that function call.

That also makes it possible to reuse the already calculated
frame->nb_samples value.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
9 years agoavcodec: Add support for per-frame AFD output in h264
Kieran Kunhya [Fri, 26 Jun 2015 20:55:06 +0000 (21:55 +0100)]
avcodec: Add support for per-frame AFD output in h264

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agonvenc: Fix NV12 input
Luca Barbato [Thu, 25 Jun 2015 23:08:42 +0000 (02:08 +0300)]
nvenc: Fix NV12 input

9 years agoavcodec/jpeg2000dec: Fix tp_index for POC
Michael Niedermayer [Fri, 26 Jun 2015 19:51:42 +0000 (21:51 +0200)]
avcodec/jpeg2000dec: Fix tp_index for POC

Fixes Ticket2586

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dec: Print what is found in place of EPH if EPH is not found
Michael Niedermayer [Fri, 26 Jun 2015 19:03:58 +0000 (21:03 +0200)]
avcodec/jpeg2000dec: Print what is found in place of EPH if EPH is not found

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibvpx: disable unused function prototypes
James Almer [Fri, 26 Jun 2015 19:37:19 +0000 (16:37 -0300)]
libvpx: disable unused function prototypes

Fixes make checkheader

Signed-off-by: James Almer <jamrial@gmail.com>
9 years agoavcodec/jpeg2000dec: Support progression order changes
Michael Niedermayer [Fri, 26 Jun 2015 18:16:32 +0000 (20:16 +0200)]
avcodec/jpeg2000dec: Support progression order changes

Fixes Ticket4657

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dec: Parse POCs
Michael Niedermayer [Fri, 26 Jun 2015 16:04:16 +0000 (18:04 +0200)]
avcodec/jpeg2000dec: Parse POCs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovc1dec: use get_bits_long and limit the read bits to 32
Andreas Cadhalpun [Thu, 25 Jun 2015 20:54:17 +0000 (22:54 +0200)]
vc1dec: use get_bits_long and limit the read bits to 32

get_bits should not be used with more than 25 bits.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agovc1dec: use get_bits_long and limit the read bits to 32
Andreas Cadhalpun [Thu, 25 Jun 2015 20:47:38 +0000 (22:47 +0200)]
vc1dec: use get_bits_long and limit the read bits to 32

get_bits should not be used with more than 25 bits.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
9 years agompegaudiodec: copy AVFloatDSPContext from first context to all contexts
Andreas Cadhalpun [Thu, 25 Jun 2015 22:27:54 +0000 (00:27 +0200)]
mpegaudiodec: copy AVFloatDSPContext from first context to all contexts

This fixes a segfault when decoding multi-channel MP3onMP4 files.

This is similar to commit cb72230d for MPADSPContext.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
9 years agofate: test ea vp6 with alpha stream
Peter Ross [Thu, 25 Jun 2015 05:06:25 +0000 (15:06 +1000)]
fate: test ea vp6 with alpha stream

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/hls: do not iterate to next sequence number if interruption is requested
schenk michael [Fri, 26 Jun 2015 04:20:34 +0000 (06:20 +0200)]
avformat/hls: do not iterate to next sequence number if interruption is requested

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil/log: modify AV_LOG_MAX_OFFSET for AV_LOG_TRACE
Zhang Rui [Fri, 26 Jun 2015 08:17:22 +0000 (16:17 +0800)]
avutil/log: modify AV_LOG_MAX_OFFSET for AV_LOG_TRACE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dec: iterate in tile sample space for CPRL & RPCL
Michael Niedermayer [Fri, 26 Jun 2015 11:44:17 +0000 (13:44 +0200)]
avcodec/jpeg2000dec: iterate in tile sample space for CPRL & RPCL

Thats what the spec says should be done
aka iterate in the wrong space and use special cases to patch that up.
It sometimes can result in different order

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg_opt: Fix sync_ist
Michael Niedermayer [Fri, 26 Jun 2015 10:37:28 +0000 (12:37 +0200)]
ffmpeg_opt: Fix sync_ist

This code was lost in 2663540821ee010edc7a47316b00a4745aaf973c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dec: Add missing \n to av_log()
Michael Niedermayer [Fri, 26 Jun 2015 02:30:18 +0000 (04:30 +0200)]
avcodec/jpeg2000dec: Add missing \n to av_log()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dec: iterate over positions with the special cases from jpeg2000
Michael Niedermayer [Fri, 26 Jun 2015 02:26:05 +0000 (04:26 +0200)]
avcodec/jpeg2000dec: iterate over positions with the special cases from jpeg2000

The order in j2k is not the simple and logic one

Fixes Ticket4670

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dec: Add coords to Jpeg2000Tile
Michael Niedermayer [Fri, 26 Jun 2015 02:25:19 +0000 (04:25 +0200)]
avcodec/jpeg2000dec: Add coords to Jpeg2000Tile

These will be needed in subsequent commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/vdpau: Support for VDPAU accelerated HEVC decoding
Philip Langdale [Sat, 13 Jun 2015 16:42:48 +0000 (09:42 -0700)]
avcodec/vdpau: Support for VDPAU accelerated HEVC decoding

This change introduces basic support for HEVC decoding through vdpau.
Right now, there are problems with the nvidia driver/library implementation
that mean that frames are incorrectly laid out in memory when they are
returned from the decoder, and it is normally impossible to recover the
complete decoded frame due to loss of data from alignment inconsistencies.

I obviously hope that nvidia will be fixing it in due course - I've verified
the problems exist with their example application.

As such, this support is not useful for any real world application, but I
believe that it is correct (with the caveat that the mangled frames may hide
problems) and will work properly once the nvidia problem is fixed.

Right now it appears that any file encoded by x265 or nvenc is decoded
correctly, but that's because these files don't use a bunch of HEVC
features.

Quick summary:

Features that seem to work:

1) Short Term References
2) Scaling Lists
3) Tiling

Features with known problems:

1) Long Term References

It's hard to tell what's going on here. After I read the nvidia example
app that does not set the IsLongTerm flag on LTRs, and changed my code,
a bunch of frames using LTR started to display correctly, but there
are still samples with glitches that are related to LTRs.

In terms of real world files, both x265 and nvenc only use short term
refs from this list. The divx encoder seems similar.

Signed-off-by: Philip Langdale <philipl@overt.org>
9 years agoavcodec/jpeg2000: Remove CBLK limit
Michael Niedermayer [Thu, 25 Jun 2015 22:14:01 +0000 (00:14 +0200)]
avcodec/jpeg2000: Remove CBLK limit

This also reduces the amount of memory needed
Fixes Ticket4672

The new code seems slightly faster as well, probably due to better cache usage

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: Use 2 instead of STDERR_FILENO
Michael Niedermayer [Thu, 25 Jun 2015 21:43:18 +0000 (23:43 +0200)]
ffmpeg: Use 2 instead of STDERR_FILENO

STDERR_FILENO is not available on windows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/evrc: make it possible to disable postfilter
Paul B Mahol [Wed, 24 Jun 2015 06:03:51 +0000 (06:03 +0000)]
avcodec/evrc: make it possible to disable postfilter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agolavc+doc: adjust names to reflect ADPCM THP not being GameCube-only
Rodger Combs [Tue, 23 Jun 2015 17:35:34 +0000 (12:35 -0500)]
lavc+doc: adjust names to reflect ADPCM THP not being GameCube-only

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf/brstm: expose the loop point when present
Rodger Combs [Tue, 23 Jun 2015 17:35:33 +0000 (12:35 -0500)]
lavf/brstm: expose the loop point when present

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoconfigure: Fix ranlib failure with older cross toolchains
Shawn Rainey [Thu, 25 Jun 2015 15:01:12 +0000 (11:01 -0400)]
configure: Fix ranlib failure with older cross toolchains

Cross-compile toolchains without support for ranlib -D would fail.
This fixes the configure script to test the cross ranlib rather than the native ranlib.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomodify exit message when signaled
rogerdpack [Thu, 25 Jun 2015 06:24:31 +0000 (00:24 -0600)]
modify exit message when signaled

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoelectronicarts: demux alpha stream
Peter Ross [Thu, 25 Jun 2015 05:05:07 +0000 (15:05 +1000)]
electronicarts: demux alpha stream

Electronic Arts VP6 files may contain two video streams: one for the
primary video stream and another for the alpha mask. The file format
uses identical data structures for both streams.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoelectronicarts: move video stream properties into dedicated structure
Peter Ross [Thu, 25 Jun 2015 05:04:58 +0000 (15:04 +1000)]
electronicarts: move video stream properties into dedicated structure

This is required for the alpha stream demux patch.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: log error message when shutting down from too many signals
rogerdpack [Thu, 25 Jun 2015 10:22:10 +0000 (12:22 +0200)]
ffmpeg: log error message when shutting down from too many signals

write() suggested by wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovp9: fix profile check for intraonly frames.
Ronald S. Bultje [Wed, 24 Jun 2015 14:41:00 +0000 (10:41 -0400)]
vp9: fix profile check for intraonly frames.

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavformat: Add H264 API test
Ludmila Glinskih [Wed, 24 Jun 2015 16:21:07 +0000 (19:21 +0300)]
libavformat: Add H264 API test

Result differs in pkt_duration and time_base.den for some reason.
Right now it tests only one example (adjusted to match the output).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dec: Limit x/y step to 1<<30
Michael Niedermayer [Wed, 24 Jun 2015 22:43:49 +0000 (00:43 +0200)]
avcodec/jpeg2000dec: Limit x/y step to 1<<30

Fixes infinite loop
Fixes Ticket4663

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000: Improve right bottom precinct positions
Michael Niedermayer [Wed, 24 Jun 2015 21:50:48 +0000 (23:50 +0200)]
avcodec/jpeg2000: Improve right bottom precinct positions

Fixes Ticket4656

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dec: Check PPx / PPy values
Michael Niedermayer [Wed, 24 Jun 2015 20:58:58 +0000 (22:58 +0200)]
avcodec/jpeg2000dec: Check PPx / PPy values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffserver: make statement block unconditional by exiting early
Reynaldo H. Verdejo Pinochet [Wed, 24 Jun 2015 22:03:19 +0000 (19:03 -0300)]
ffserver: make statement block unconditional by exiting early

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years agoffserver: make statement block unconditional by exiting early
Reynaldo H. Verdejo Pinochet [Wed, 24 Jun 2015 21:57:42 +0000 (18:57 -0300)]
ffserver: make statement block unconditional by exiting early

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years agoffserver: unify comment formating & drop unneeded braces
Reynaldo H. Verdejo Pinochet [Wed, 24 Jun 2015 21:49:38 +0000 (18:49 -0300)]
ffserver: unify comment formating & drop unneeded braces

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years agoffserver: factor out stream params printing
Reynaldo H. Verdejo Pinochet [Wed, 24 Jun 2015 20:41:06 +0000 (17:41 -0300)]
ffserver: factor out stream params printing

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years agoffserver: simplify URLContext cleanup
Reynaldo H. Verdejo Pinochet [Tue, 23 Jun 2015 16:53:43 +0000 (13:53 -0300)]
ffserver: simplify URLContext cleanup

Drop unneeded var and avoid checking for NULL twice as
ffurl_closep() already does this.

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
9 years agolibvpxdec: report colorspace
James Zern [Tue, 23 Jun 2015 21:41:26 +0000 (14:41 -0700)]
libvpxdec: report colorspace

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Zern <jzern@google.com>
9 years agolibvpxdec: report profile for vp9
James Zern [Tue, 23 Jun 2015 21:25:26 +0000 (14:25 -0700)]
libvpxdec: report profile for vp9

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Zern <jzern@google.com>
9 years agoMerge commit '5dbd491eb38efab1d1313d4129ed76ab2e98176d'
Michael Niedermayer [Wed, 24 Jun 2015 19:06:54 +0000 (21:06 +0200)]
Merge commit '5dbd491eb38efab1d1313d4129ed76ab2e98176d'

* commit '5dbd491eb38efab1d1313d4129ed76ab2e98176d':
  TextureDSP: fix erroneous condition which produced blocky output for DXT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '4d55484391112a30d16812597b9ad81605af0c24'
Michael Niedermayer [Wed, 24 Jun 2015 18:53:26 +0000 (20:53 +0200)]
Merge commit '4d55484391112a30d16812597b9ad81605af0c24'

* commit '4d55484391112a30d16812597b9ad81605af0c24':
  dds: Fix palette mode on big endian

Conflicts:
libavcodec/dds.c

See: 21d2e3d602dc5f173901ba51f6a237b9dfce9e8e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'ded5957d75def70d2f1fc1c1eae079230004974b'
Michael Niedermayer [Wed, 24 Jun 2015 18:50:44 +0000 (20:50 +0200)]
Merge commit 'ded5957d75def70d2f1fc1c1eae079230004974b'

* commit 'ded5957d75def70d2f1fc1c1eae079230004974b':
  segafilm: Remove deplanarization hack

Conflicts:
libavformat/segafilm.c
libavformat/version.h

See: 42b8f5fba1f067c55231791039283e41b5167247
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec: Add codec_desc and remapping for AV_CODEC_ID_PCM_S16BE_PLANAR_DEPRECATED
Michael Niedermayer [Wed, 24 Jun 2015 18:37:02 +0000 (20:37 +0200)]
avcodec: Add codec_desc and remapping for AV_CODEC_ID_PCM_S16BE_PLANAR_DEPRECATED

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '5a79bf0284a37855636390e620d189a964214c9e'
Michael Niedermayer [Wed, 24 Jun 2015 18:32:12 +0000 (20:32 +0200)]
Merge commit '5a79bf0284a37855636390e620d189a964214c9e'

* commit '5a79bf0284a37855636390e620d189a964214c9e':
  PCM signed 16-bit big-endian planar decoder

Conflicts:
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/pcm.c
libavcodec/version.h
libavformat/nut.c

See: 9ba41ae63e079198ef4a9e83b5fa147e20966bdb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agobrstm: fix use of uninitialized variables
James Almer [Wed, 24 Jun 2015 17:16:41 +0000 (14:16 -0300)]
brstm: fix use of uninitialized variables

Fixes valgrind complaining about "Conditional jump or move depends on uninitialised value(s)"

Signed-off-by: James Almer <jamrial@gmail.com>
9 years agoavcodec/jpeg2000: change flags array type to 16bit
Michael Niedermayer [Wed, 24 Jun 2015 15:44:30 +0000 (17:44 +0200)]
avcodec/jpeg2000: change flags array type to 16bit

reduce memory needed for flags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovcodec/jpeg2000: Increase cblk size limit to 128
Michael Niedermayer [Wed, 24 Jun 2015 15:38:05 +0000 (17:38 +0200)]
vcodec/jpeg2000: Increase cblk size limit to 128

Fixes Ticket4649

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dec: Use 32x32->64bit for 9/7i dequantization
Michael Niedermayer [Wed, 24 Jun 2015 15:07:27 +0000 (17:07 +0200)]
avcodec/jpeg2000dec: Use 32x32->64bit for 9/7i dequantization

Like the 5/3 case this is needed to avoid overflows and similarly for 16bpp
output pure 32bit operations are insufficient if high quality is wanted

Note, this code-path is only used in bitexact mode, so this should not
affect the speed of any real use-case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dec: Add 5/3 de-quantization special case for the lossless case
Michael Niedermayer [Wed, 24 Jun 2015 15:05:42 +0000 (17:05 +0200)]
avcodec/jpeg2000dec: Add 5/3 de-quantization special case for the lossless case

This avoids a multiplication and 64bits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dec: Use 32x32->64bit for 5/3 dequantization
Michael Niedermayer [Wed, 24 Jun 2015 15:00:58 +0000 (17:00 +0200)]
avcodec/jpeg2000dec: Use 32x32->64bit for 5/3 dequantization

This fixes overflows, using fewer bits would impact high bit depth quality

Fixes Ticket4654

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter: add ssim filter
Paul B Mahol [Sun, 21 Jun 2015 11:27:55 +0000 (11:27 +0000)]
avfilter: add ssim filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agoTextureDSP: fix erroneous condition which produced blocky output for DXT
Tom Butterworth [Tue, 23 Jun 2015 16:40:11 +0000 (17:40 +0100)]
TextureDSP: fix erroneous condition which produced blocky output for DXT

9 years agodds: Fix palette mode on big endian
Luca Barbato [Tue, 23 Jun 2015 12:48:10 +0000 (13:48 +0100)]
dds: Fix palette mode on big endian

Found-By: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
9 years agosegafilm: Remove deplanarization hack
Paul B Mahol [Tue, 23 Jun 2015 12:48:08 +0000 (13:48 +0100)]
segafilm: Remove deplanarization hack

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
9 years agoPCM signed 16-bit big-endian planar decoder
Paul B Mahol [Tue, 23 Jun 2015 12:48:07 +0000 (13:48 +0100)]
PCM signed 16-bit big-endian planar decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
9 years agolavf: set is_connected flag so url can be properly closed
Mariusz Szczepańczyk [Tue, 23 Jun 2015 01:35:16 +0000 (03:35 +0200)]
lavf: set is_connected flag so url can be properly closed

Reviewed-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: Do not use the data/size of a bitstream filter after failure
Michael Niedermayer [Wed, 24 Jun 2015 11:27:39 +0000 (13:27 +0200)]
ffmpeg: Do not use the data/size of a bitstream filter after failure

Found-by: Rodger Combs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '41740ef8be6ec409f7eff3932ddba9a9eeec27b1'
Michael Niedermayer [Wed, 24 Jun 2015 10:39:17 +0000 (12:39 +0200)]
Merge commit '41740ef8be6ec409f7eff3932ddba9a9eeec27b1'

* commit '41740ef8be6ec409f7eff3932ddba9a9eeec27b1':
  libvpx: fix test for VPX_IMAGE_ABI_VERSION

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'a88e21f5b78ef5e75b073ecbfd4e92921002a703'
Michael Niedermayer [Wed, 24 Jun 2015 10:22:18 +0000 (12:22 +0200)]
Merge commit 'a88e21f5b78ef5e75b073ecbfd4e92921002a703'

* commit 'a88e21f5b78ef5e75b073ecbfd4e92921002a703':
  Fix missing symbols when libvpx has only vp8 enabled

Not merged, the FFmpeg libvpx-vp8 encoder does not use anything from libvpx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'c2de2cf0d2927f3f584dab6d54276fbda92a0a71'
Michael Niedermayer [Wed, 24 Jun 2015 09:58:07 +0000 (11:58 +0200)]
Merge commit 'c2de2cf0d2927f3f584dab6d54276fbda92a0a71'

* commit 'c2de2cf0d2927f3f584dab6d54276fbda92a0a71':
  arm64: constify src in h264qpel dsp function definitions

See: e16b7338d8777618936ff6ab9133e19f4db9069c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibvpx: fix test for VPX_IMAGE_ABI_VERSION
Janne Grunau [Wed, 24 Jun 2015 06:39:40 +0000 (08:39 +0200)]
libvpx: fix test for VPX_IMAGE_ABI_VERSION

9 years agoFix missing symbols when libvpx has only vp8 enabled
Mark Webster [Wed, 24 Jun 2015 05:14:50 +0000 (06:14 +0100)]
Fix missing symbols when libvpx has only vp8 enabled

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoarm64: constify src in h264qpel dsp function definitions
Janne Grunau [Sun, 14 Jun 2015 18:53:56 +0000 (20:53 +0200)]
arm64: constify src in h264qpel dsp function definitions

9 years agoavformat/mp3dec: Remove the ID3v1 tag removial code
Michael Niedermayer [Wed, 24 Jun 2015 00:46:05 +0000 (02:46 +0200)]
avformat/mp3dec: Remove the ID3v1 tag removial code

The code is simply broken, the read packets are not aligned to
the mp3 frames, the file end or the id3 tag thus this simply
cannot reliably find the ID3v1 tag to remove it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/mpegaudio_parser: Discard ID3v1 tag at the end
Michael Niedermayer [Wed, 24 Jun 2015 00:37:58 +0000 (02:37 +0200)]
avcodec/mpegaudio_parser: Discard ID3v1 tag at the end

Ideally this should be discarded by the demuxer but this is not
possible without fully parsing which would be then very similar
to this. The current ID3v1 discard code in the demuxer does not work
and will be removed in a subsequent commit

The discard code could be adjusted if needed to also discard tags at
other locations than the end or to limit this possibly to input
from the mp3 demuxer or even to move the discarding to the
decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf/libssh: implement move and delete callbacks
Mariusz Szczepańczyk [Tue, 23 Jun 2015 01:04:21 +0000 (03:04 +0200)]
lavf/libssh: implement move and delete callbacks

Reviewed-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf/libssh: read empty path from url as /
Mariusz Szczepańczyk [Tue, 23 Jun 2015 01:04:20 +0000 (03:04 +0200)]
lavf/libssh: read empty path from url as /

Reviewed-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf/libssh: implement directory listing callbacks
Lukasz Marek [Tue, 23 Jun 2015 01:04:19 +0000 (03:04 +0200)]
lavf/libssh: implement directory listing callbacks

Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf/libsmbclient: implement move and delete callbacks
Mariusz Szczepańczyk [Mon, 22 Jun 2015 02:58:00 +0000 (04:58 +0200)]
lavf/libsmbclient: implement move and delete callbacks

Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf/brstm: add FATE tests for BFSTM and BCSTM files
Rodger Combs [Tue, 23 Jun 2015 17:35:36 +0000 (12:35 -0500)]
lavf/brstm: add FATE tests for BFSTM and BCSTM files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/jpeg2000dwt: Replace /2 by >>1
Michael Niedermayer [Tue, 23 Jun 2015 16:47:18 +0000 (18:47 +0200)]
avcodec/jpeg2000dwt: Replace /2 by >>1

Divisions can be slow if the compiler fails to replace them by shifts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswscale/x86/rgb2rgb_template: fix signedness of v in shuffle_bytes_2103_{mmx,mmxext}
James Almer [Tue, 23 Jun 2015 04:15:07 +0000 (01:15 -0300)]
swscale/x86/rgb2rgb_template: fix signedness of v in shuffle_bytes_2103_{mmx,mmxext}

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
9 years agoswscale/x86/rgb2rgb_template: don't call emms on sse2/avx functions
James Almer [Tue, 23 Jun 2015 04:14:42 +0000 (01:14 -0300)]
swscale/x86/rgb2rgb_template: don't call emms on sse2/avx functions

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
9 years agoswscale/x86/rgb2rgb_template: add missing xmm clobbers
James Almer [Tue, 23 Jun 2015 04:14:16 +0000 (01:14 -0300)]
swscale/x86/rgb2rgb_template: add missing xmm clobbers

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
9 years agoavcodec/texturedspenc: Add () to protect macro / argument evaluation order
Michael Niedermayer [Tue, 23 Jun 2015 15:02:22 +0000 (17:02 +0200)]
avcodec/texturedspenc: Add () to protect macro / argument evaluation order

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovaapi_h264: fix RefPicList[] field flags.
Gwenole Beauchesne [Tue, 23 Jun 2015 09:35:45 +0000 (11:35 +0200)]
vaapi_h264: fix RefPicList[] field flags.

Use new H264Ref.reference field to track field picture flags. The
H264Picture.reference flag in DPB is now irrelevant here.

This is a regression from git commit d8151a7, and that affected
multiple interlaced video streams.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
9 years agovda: unlock the pixel buffer base address.
Sebastien Zwickert [Sat, 20 Jun 2015 11:19:29 +0000 (13:19 +0200)]
vda: unlock the pixel buffer base address.

The pixel buffer base address is never unlocked this causes
a bug with some pixel format types that are produced natively
by the hardware decoder: the first buffer was always used.
Unlock the pixel buffer base address fixes the issue.

9 years agomovtextdec.c: Improve upon dynarrays and text_to_ass
Niklesh [Mon, 22 Jun 2015 14:17:06 +0000 (19:47 +0530)]
movtextdec.c: Improve upon dynarrays and text_to_ass

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>
9 years agoswscale/rgb2rgb_template: Fix signedness of v in shuffle_bytes_2103_c()
Michael Niedermayer [Tue, 23 Jun 2015 03:09:11 +0000 (05:09 +0200)]
swscale/rgb2rgb_template: Fix signedness of v in shuffle_bytes_2103_c()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswscale/rgb2rgb_template: Implement shuffle_bytes_0321_c and fix shuffle_bytes_2103_c...
Michael Niedermayer [Tue, 23 Jun 2015 02:36:02 +0000 (04:36 +0200)]
swscale/rgb2rgb_template: Implement shuffle_bytes_0321_c and fix shuffle_bytes_2103_c on BE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/texturedsp: Add protective () to RGBA() macro
Michael Niedermayer [Tue, 23 Jun 2015 02:19:05 +0000 (04:19 +0200)]
avcodec/texturedsp: Add protective () to RGBA() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/mpegts: Use STREAM_TYPE_PRIVATE_DATA instead of 6
Michael Niedermayer [Tue, 23 Jun 2015 01:42:12 +0000 (03:42 +0200)]
avformat/mpegts: Use STREAM_TYPE_PRIVATE_DATA instead of 6

Suggested-by: Wolfgang Lorenz <wl-chmw@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>