ffmpeg.git
5 years agoMerge commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b'
Michael Niedermayer [Sat, 5 Jul 2014 01:41:35 +0000 (03:41 +0200)]
Merge commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b'

* commit 'e0bfe34ea8ccf333ec5b17961fd58eb575e74f8b':
  libfdk-aacdec: Reduce the default decoder delay by one frame

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibfdk-aacdec: Reduce the default decoder delay by one frame
Omer Osman [Fri, 4 Jul 2014 09:05:44 +0000 (11:05 +0200)]
libfdk-aacdec: Reduce the default decoder delay by one frame

The default error concealment method if none is set via
aacDecoder_SetParam(AAC_CONCEAL_METHOD) is set in
CConcealment_InitCommonData within the fdk-aac library
and is set to Energy Interpolation. This method requires one frame
delay to the output. To reduce the default decoder output delay and
avoid missing the last frame in file based decoding, use Noise
Substitution as the default concealment method.

Signed-off-by: Omer Osman <omer.osman@iis.fraunhofer.de>
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoDoxyfile: imitate gcc for better libavutil/attributes.h documentation
Timothy Gu [Fri, 4 Jul 2014 18:06:47 +0000 (11:06 -0700)]
Doxyfile: imitate gcc for better libavutil/attributes.h documentation

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodownmix_info: clarify doxygen
Timothy Gu [Fri, 4 Jul 2014 18:06:45 +0000 (11:06 -0700)]
downmix_info: clarify doxygen

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agochannel_layout: doxy: merge functions with macros
Timothy Gu [Fri, 4 Jul 2014 18:06:44 +0000 (11:06 -0700)]
channel_layout: doxy: merge functions with macros

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoDoxyfile: enable browser-based search engine
Timothy Gu [Fri, 4 Jul 2014 18:06:46 +0000 (11:06 -0700)]
Doxyfile: enable browser-based search engine

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil: fix version macros doxygen module
Timothy Gu [Fri, 4 Jul 2014 18:06:42 +0000 (11:06 -0700)]
avutil: fix version macros doxygen module

Without this patch, "Library Version Macros" module is not visible on
libavutil homepage in `make apidoc`.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/libssh: call ssh_userauth_none before ssh_userauth_list
Lukasz Marek [Fri, 4 Jul 2014 17:50:13 +0000 (19:50 +0200)]
lavf/libssh: call ssh_userauth_none before ssh_userauth_list

According to doc, ssh_userauth_none must be called before ssh_userauth_list.
It solves login issue for new versions of libssh.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mlp_parser: check ff_combine_frame() return code
Michael Niedermayer [Fri, 4 Jul 2014 17:33:54 +0000 (19:33 +0200)]
avcodec/mlp_parser: check ff_combine_frame() return code

Fixes CID602338

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2dec: remove functions from image pipe which are unneeded for image pipes
Michael Niedermayer [Fri, 4 Jul 2014 14:44:40 +0000 (16:44 +0200)]
avformat/img2dec: remove functions from image pipe which are unneeded for image pipes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/bmp: fix integer overflow in checking header sizes
Michael Niedermayer [Fri, 4 Jul 2014 12:37:01 +0000 (14:37 +0200)]
avcodec/bmp: fix integer overflow in checking header sizes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2dec: improve bmp probe
Michael Niedermayer [Fri, 4 Jul 2014 02:54:52 +0000 (04:54 +0200)]
avformat/img2dec: improve bmp probe

fix probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2dec: increase probe buffer to 2k
Michael Niedermayer [Fri, 4 Jul 2014 02:54:32 +0000 (04:54 +0200)]
avformat/img2dec: increase probe buffer to 2k

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: update dependencies for vf_spp
Michael Niedermayer [Fri, 4 Jul 2014 02:47:13 +0000 (04:47 +0200)]
configure: update dependencies for vf_spp

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2dec: set AVProbeData size correctly on corner cases of tiny files
Michael Niedermayer [Fri, 4 Jul 2014 01:43:02 +0000 (03:43 +0200)]
avformat/img2dec: set AVProbeData size correctly on corner cases of tiny files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2dec: avoid seekback on probeing
Michael Niedermayer [Fri, 4 Jul 2014 01:42:30 +0000 (03:42 +0200)]
avformat/img2dec: avoid seekback on probeing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/img2dec: allocate and clear padding area for probe correctly
Michael Niedermayer [Fri, 4 Jul 2014 01:40:53 +0000 (03:40 +0200)]
avformat/img2dec: allocate and clear padding area for probe correctly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Fri, 4 Jul 2014 00:19:04 +0000 (02:19 +0200)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavf/ftp: always treat all response codes >= 500 as error
  lavf/ftp: explicitly enable UTF-8
  lavf/ftp: make response parsing more RFC compliant

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/swr: use lavu helper macros to check CPU extensions
James Almer [Thu, 3 Jul 2014 01:16:50 +0000 (22:16 -0300)]
x86/swr: use lavu helper macros to check CPU extensions

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAutodetect JPEG2000 imagess.
Carl Eugen Hoyos [Fri, 4 Jul 2014 00:10:26 +0000 (02:10 +0200)]
Autodetect JPEG2000 imagess.

Autodetection of jp2 files does not work yet, the files are detected
as mov.

5 years agox86/swr: split audioconvert and rematrix DSP into separate files
James Almer [Thu, 3 Jul 2014 01:16:49 +0000 (22:16 -0300)]
x86/swr: split audioconvert and rematrix DSP into separate files

Also rename resample_x86_dsp.c to resample_init.c

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswr: initialize only the necessary resample dsp functions
James Almer [Thu, 3 Jul 2014 01:16:48 +0000 (22:16 -0300)]
swr: initialize only the necessary resample dsp functions

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/ftp: always treat all response codes >= 500 as error
Lukasz Marek [Thu, 3 Jul 2014 23:05:48 +0000 (01:05 +0200)]
lavf/ftp: always treat all response codes >= 500 as error

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavf/ftp: explicitly enable UTF-8
Lukasz Marek [Thu, 3 Jul 2014 22:32:16 +0000 (00:32 +0200)]
lavf/ftp: explicitly enable UTF-8

Most FTP servers enable UTF-8 by default, but it is not required by the standard.
Enabling it manually makes ffmpeg implementation more consistent when server
doesn't enable it by default.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agolavf/ftp: make response parsing more RFC compliant
Lukasz Marek [Thu, 3 Jul 2014 19:08:23 +0000 (21:08 +0200)]
lavf/ftp: make response parsing more RFC compliant

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoMerge commit '391ecc961ced2bde7aecb3053ac35191f838fae8'
Michael Niedermayer [Thu, 3 Jul 2014 23:17:39 +0000 (01:17 +0200)]
Merge commit '391ecc961ced2bde7aecb3053ac35191f838fae8'

* commit '391ecc961ced2bde7aecb3053ac35191f838fae8':
  x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase

Conflicts:
libavcodec/x86/mpegvideoenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced'
Michael Niedermayer [Thu, 3 Jul 2014 23:08:35 +0000 (01:08 +0200)]
Merge commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced'

* commit 'c6698dfe7cdbc7634f33245875488ed3fa4a8ced':
  webpdec: Fix decoding of the huffman group indices.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9279826008b80daad7446950a821f32033ccd33f'
Michael Niedermayer [Thu, 3 Jul 2014 22:50:28 +0000 (00:50 +0200)]
Merge commit '9279826008b80daad7446950a821f32033ccd33f'

* commit '9279826008b80daad7446950a821f32033ccd33f':
  id3v2enc: use a case-insensitive comparison for APIC picture type

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvdsubdec: fix alpha in debuging code
Oliver Fromme [Thu, 3 Jul 2014 14:12:12 +0000 (16:12 +0200)]
avcodec/dvdsubdec: fix alpha in debuging code

improve the debugging function for saving subtitles
to PPM files: Actually use the alpha channel.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvdsubdec: Fix off-by-one error
Oliver Fromme [Thu, 3 Jul 2014 14:12:12 +0000 (16:12 +0200)]
avcodec/dvdsubdec: Fix off-by-one error

Fix an off-by-one error that causes the height of decoded
subtitles to be too small, thus cutting off the lowest row
of pixels.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase
Diego Biurrun [Mon, 30 Dec 2013 16:06:45 +0000 (17:06 +0100)]
x86: mpegvideoenc: Change SIMD optimization name suffixes to lowercase

5 years agoMerge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1'
Michael Niedermayer [Thu, 3 Jul 2014 19:42:16 +0000 (21:42 +0200)]
Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1'

* commit '0955e57ad07640574fc20ce0bea3c0b83982ada1':
  daud: split muxer and demuxer

Conflicts:
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agowebpdec: Fix decoding of the huffman group indices.
Justin Ruggles [Thu, 3 Jul 2014 15:28:17 +0000 (11:28 -0400)]
webpdec: Fix decoding of the huffman group indices.

Per the specification, "The red and green components of a pixel
define the meta Huffman code used in a particular block of the ARGB
image."

5 years agoMerge commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0'
Michael Niedermayer [Thu, 3 Jul 2014 19:02:56 +0000 (21:02 +0200)]
Merge commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0'

* commit 'f920d089535bf7cf10aeda900cc43201c5e18cd0':
  ismindex: Add an option for outputting files elsewhere than in the current directory

Conflicts:
tools/ismindex.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoid3v2enc: use a case-insensitive comparison for APIC picture type
Anton Khirnov [Wed, 2 Jul 2014 20:41:47 +0000 (22:41 +0200)]
id3v2enc: use a case-insensitive comparison for APIC picture type

5 years agoMerge commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e'
Michael Niedermayer [Thu, 3 Jul 2014 18:37:00 +0000 (20:37 +0200)]
Merge commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e'

* commit '6bc4934b75dde9354ee16a6e700ebe6775abf69e':
  ismindex: Allow adding a path prefix to the generated .ism file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodaud: split muxer and demuxer
Nidhi Makhijani [Mon, 23 Jun 2014 04:03:50 +0000 (09:33 +0530)]
daud: split muxer and demuxer

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoismindex: Add an option for outputting files elsewhere than in the current directory
Martin Storsjö [Wed, 2 Jul 2014 20:02:58 +0000 (23:02 +0300)]
ismindex: Add an option for outputting files elsewhere than in the current directory

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoismindex: Allow adding a path prefix to the generated .ism file
Martin Storsjö [Wed, 2 Jul 2014 19:44:32 +0000 (22:44 +0300)]
ismindex: Allow adding a path prefix to the generated .ism file

This allows storing the .ismv/.isma/.ismc files separately from
the .ism file on a server, without having to manually edit the
.ism file after generating it with the ismindex tool.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavformat: Add image3 demuxers with format autodetection
Carl Eugen Hoyos [Sat, 21 Jun 2014 19:43:19 +0000 (21:43 +0200)]
avformat: Add image3 demuxers with format autodetection

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoivfenc: support VP9
James Zern [Thu, 3 Jul 2014 03:28:39 +0000 (20:28 -0700)]
ivfenc: support VP9

libvpx tools accept vp9 ivf files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_drawtext: fix resource leak
Leandro Santiago [Wed, 2 Jul 2014 12:39:50 +0000 (09:39 -0300)]
avfilter/vf_drawtext: fix resource leak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/avformat: minor grammar improvement
Michael Niedermayer [Thu, 3 Jul 2014 11:51:53 +0000 (13:51 +0200)]
avformat/avformat: minor grammar improvement

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b'
Michael Niedermayer [Thu, 3 Jul 2014 11:38:28 +0000 (13:38 +0200)]
Merge commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b'

* commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b':
  lavf: document av_dump_format()

Conflicts:
libavformat/avformat.h

See: 61f96be08a66e74897406fd64da4e61ea4b6a8c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'df949b645b12d62bb4da56d629a887c81f67f2e5'
Michael Niedermayer [Thu, 3 Jul 2014 11:15:33 +0000 (13:15 +0200)]
Merge commit 'df949b645b12d62bb4da56d629a887c81f67f2e5'

* commit 'df949b645b12d62bb4da56d629a887c81f67f2e5':
  hevc: Use the local context variable when needed

Conflicts:
libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavdevice/pulse_audio_dec: clear pa_simple pointer after deallocation
Michael Niedermayer [Thu, 3 Jul 2014 02:26:18 +0000 (04:26 +0200)]
avdevice/pulse_audio_dec: clear pa_simple pointer after deallocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter: add flanger filter
Paul B Mahol [Fri, 27 Jun 2014 08:42:35 +0000 (08:42 +0000)]
avfilter: add flanger filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavfilter/af_aphaser: move wave table generation code into separate file
Paul B Mahol [Thu, 26 Jun 2014 08:54:23 +0000 (08:54 +0000)]
avfilter/af_aphaser: move wave table generation code into separate file

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agolavf: document av_dump_format()
Vittorio Giovara [Sun, 8 Jun 2014 15:56:34 +0000 (11:56 -0400)]
lavf: document av_dump_format()

5 years agohevc: Use the local context variable when needed
Luca Barbato [Wed, 18 Jun 2014 02:13:20 +0000 (04:13 +0200)]
hevc: Use the local context variable when needed

5 years agoavfilter/vf_format: Check pix_fmts before dereferencing it
Michael Niedermayer [Thu, 3 Jul 2014 00:05:34 +0000 (02:05 +0200)]
avfilter/vf_format: Check pix_fmts before dereferencing it

Fixes CID1224286

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/avfiltergraph: dont "or" together error codes
Michael Niedermayer [Wed, 2 Jul 2014 23:37:00 +0000 (01:37 +0200)]
avfilter/avfiltergraph: dont "or" together error codes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix standalone compilation of the wtv muxer.
Carl Eugen Hoyos [Wed, 2 Jul 2014 21:41:29 +0000 (23:41 +0200)]
Fix standalone compilation of the wtv muxer.

5 years agoavcodec/on2avc: Fix out of array access
Michael Niedermayer [Wed, 2 Jul 2014 18:22:12 +0000 (20:22 +0200)]
avcodec/on2avc: Fix out of array access

Fixes CID1206648

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '98569d89638efc325042bd0081e9a02181afdafa'
Michael Niedermayer [Wed, 2 Jul 2014 18:05:54 +0000 (20:05 +0200)]
Merge commit '98569d89638efc325042bd0081e9a02181afdafa'

* commit '98569d89638efc325042bd0081e9a02181afdafa':
  matroskadec: Fix a double negation typo

See: 2c5b92fe90463402be6bf611ef40195f86f434fd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: Updated comment for sub param
Anshul Maheshwari [Wed, 2 Jul 2014 16:37:59 +0000 (22:07 +0530)]
avcodec: Updated comment for sub param

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvbsubdec: removed unnecessary null check for subtitle
Anshul Maheshwari [Wed, 2 Jul 2014 16:21:37 +0000 (21:51 +0530)]
avcodec/dvbsubdec: removed unnecessary null check for subtitle

In refrence to coverity defect 1224278

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomatroskadec: Fix a double negation typo
Michael Niedermayer [Sat, 20 Oct 2012 14:58:33 +0000 (16:58 +0200)]
matroskadec: Fix a double negation typo

This typo has existed since this code was added in c16582579.
Newer versions of clang pointed out that this comparison always
was true (since the result of the negation is either 0 or 1, while
AVDISCARD_ALL has the value 48).

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agolavfi/overlay: show incoming frames on debug messages
Stefano Sabatini [Fri, 20 Jun 2014 11:33:37 +0000 (13:33 +0200)]
lavfi/overlay: show incoming frames on debug messages

This is especially useful to debug queue overflow issues.

Ideally we should be able to set the debug message at the
dualinput/framesync level, but they do not have the information related
to the filter context and the inlink, so cannot access much useful
information.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agoavcodec/dvdec: remove redundant null check
Michael Niedermayer [Wed, 2 Jul 2014 14:18:07 +0000 (16:18 +0200)]
avcodec/dvdec: remove redundant null check

Fixes CID700682 again

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/bitstream: remove trivial assert
Michael Niedermayer [Wed, 2 Jul 2014 13:34:48 +0000 (15:34 +0200)]
avcodec/bitstream: remove trivial assert

Fixed CID1224273

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswr: rename swresample_dsp init functions to swri_resample_dsp
James Almer [Wed, 2 Jul 2014 03:05:08 +0000 (00:05 -0300)]
swr: rename swresample_dsp init functions to swri_resample_dsp

The swresample_ prefix is not for internal functions

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/filters: fix typo
Dave Rice [Wed, 2 Jul 2014 02:44:05 +0000 (22:44 -0400)]
doc/filters: fix typo

Signed-off-by: Dave Rice <dave@dericed.com>
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: check av_opt_set_dict() return
Michael Niedermayer [Wed, 2 Jul 2014 03:20:26 +0000 (05:20 +0200)]
ffmpeg: check av_opt_set_dict() return

Fixes CID1224275

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/ffprobe.xsd: fix order and missing elements/attributes
Dave Rice [Wed, 2 Jul 2014 01:49:11 +0000 (21:49 -0400)]
doc/ffprobe.xsd: fix order and missing elements/attributes

Signed-off-by: Dave Rice <dave@dericed.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswr: remove obsolete resample prototypes
James Almer [Wed, 2 Jul 2014 00:22:28 +0000 (21:22 -0300)]
swr: remove obsolete resample prototypes

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoPartially revert "swr: add prototypes for resample dsp functions"
James Almer [Tue, 1 Jul 2014 21:45:21 +0000 (18:45 -0300)]
Partially revert "swr: add prototypes for resample dsp functions"

Prototypes are not needed anymore now that the x86 functions don't
include resample_template.c

The DO_RESAMPLE_ONE macro is removed for that same reason as well.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/swr: add ff_resample_{common, linear}_int16_xop
James Almer [Mon, 30 Jun 2014 16:06:02 +0000 (13:06 -0300)]
x86/swr: add ff_resample_{common, linear}_int16_xop

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/swr: add ff_resample_{common, linear}_float_fma
James Almer [Mon, 30 Jun 2014 16:06:01 +0000 (13:06 -0300)]
x86/swr: add ff_resample_{common, linear}_float_fma

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: rename dsputil.asm to idctdsp.asm
James Almer [Tue, 1 Jul 2014 21:10:15 +0000 (18:10 -0300)]
x86: rename dsputil.asm to idctdsp.asm

Its only function is no longer part of dsputil.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: factorize some parts of the pix_fmt_id switch()
Michael Niedermayer [Tue, 1 Jul 2014 21:28:18 +0000 (23:28 +0200)]
avcodec/mjpegdec: factorize some parts of the pix_fmt_id switch()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: handle luma upscale detection generically
Michael Niedermayer [Tue, 1 Jul 2014 21:26:19 +0000 (23:26 +0200)]
avcodec/mjpegdec: handle luma upscale detection generically

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: set upscale_h/upscale_v using generic code instead of hardcoding...
Michael Niedermayer [Tue, 1 Jul 2014 20:40:20 +0000 (22:40 +0200)]
avcodec/mjpegdec: set upscale_h/upscale_v using generic code instead of hardcoding a list

Some code is left to handle corner cases

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: Support pix_fmt_id==0x11222200
Michael Niedermayer [Tue, 1 Jul 2014 20:11:46 +0000 (22:11 +0200)]
avcodec/mjpegdec: Support pix_fmt_id==0x11222200

Fixes: 4858286_300.jpg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: fix width for non chroma in rescaling
Michael Niedermayer [Tue, 1 Jul 2014 20:09:19 +0000 (22:09 +0200)]
avcodec/mjpegdec: fix width for non chroma in rescaling

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomjpegdec: Support pix_fmt_id == 0x22112200
Michael Niedermayer [Tue, 1 Jul 2014 19:47:09 +0000 (21:47 +0200)]
mjpegdec: Support pix_fmt_id == 0x22112200

Fixes 4780490_300.jpg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4'
Michael Niedermayer [Tue, 1 Jul 2014 18:44:05 +0000 (20:44 +0200)]
Merge commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4'

* commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4':
  matroska: Factor out mkv_write_stereo_mode

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b75a1f9892b5b715397edbf837e4d4cda337907b'
Michael Niedermayer [Tue, 1 Jul 2014 18:22:51 +0000 (20:22 +0200)]
Merge commit 'b75a1f9892b5b715397edbf837e4d4cda337907b'

* commit 'b75a1f9892b5b715397edbf837e4d4cda337907b':
  matroska: Factor out write_track from mkv_write_tracks

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e'
Michael Niedermayer [Tue, 1 Jul 2014 17:58:57 +0000 (19:58 +0200)]
Merge commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e'

* commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e':
  matroska: K&R formatting cosmetics

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd0449e754553b0c110b6cd75f6725b82144fbd2a'
Michael Niedermayer [Tue, 1 Jul 2014 17:28:55 +0000 (19:28 +0200)]
Merge commit 'd0449e754553b0c110b6cd75f6725b82144fbd2a'

* commit 'd0449e754553b0c110b6cd75f6725b82144fbd2a':
  vaapi: Update idct_permutation location after dsputil/idctdsp split

See: 581b5f0b9b93969712e73e0ae6324bbd03e85d4e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/swr: convert resample_{common, linear}_double_sse2 to yasm
James Almer [Mon, 30 Jun 2014 16:06:00 +0000 (13:06 -0300)]
x86/swr: convert resample_{common, linear}_double_sse2 to yasm

Signed-off-by: James Almer <jamrial@gmail.com>
312531 -> 311528 dezicycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomatroska: Factor out mkv_write_stereo_mode
Luca Barbato [Fri, 6 Jun 2014 23:38:00 +0000 (01:38 +0200)]
matroska: Factor out mkv_write_stereo_mode

5 years agomatroska: Factor out write_track from mkv_write_tracks
Luca Barbato [Fri, 6 Jun 2014 23:21:13 +0000 (01:21 +0200)]
matroska: Factor out write_track from mkv_write_tracks

5 years agomatroska: K&R formatting cosmetics
Luca Barbato [Fri, 6 Jun 2014 22:54:50 +0000 (00:54 +0200)]
matroska: K&R formatting cosmetics

5 years agovaapi: Update idct_permutation location after dsputil/idctdsp split
Diego Biurrun [Tue, 1 Jul 2014 14:27:50 +0000 (07:27 -0700)]
vaapi: Update idct_permutation location after dsputil/idctdsp split

5 years agoMerge commit '20f95f21f9b9595608ba668a6eca78f2d508be67'
Michael Niedermayer [Tue, 1 Jul 2014 14:31:54 +0000 (16:31 +0200)]
Merge commit '20f95f21f9b9595608ba668a6eca78f2d508be67'

* commit '20f95f21f9b9595608ba668a6eca78f2d508be67':
  mov: Support default-base-is-moof.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '79793f833784121d574454af4871866576c0749d'
Michael Niedermayer [Tue, 1 Jul 2014 13:37:21 +0000 (15:37 +0200)]
Merge commit '79793f833784121d574454af4871866576c0749d'

* commit '79793f833784121d574454af4871866576c0749d':
  Update Fiona's name in copyright statements.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'
Michael Niedermayer [Tue, 1 Jul 2014 12:38:57 +0000 (14:38 +0200)]
Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'

* commit 'e3fcb14347466095839c2a3c47ebecff02da891e':
  dsputil: Split off IDCT bits into their own context

Conflicts:
configure
libavcodec/aic.c
libavcodec/arm/Makefile
libavcodec/arm/dsputil_init_arm.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/asvdec.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/dvdec.c
libavcodec/dxva2_mpeg2.c
libavcodec/intrax8.c
libavcodec/mdec.c
libavcodec/mjpegdec.c
libavcodec/mjpegenc_common.h
libavcodec/mpegvideo.c
libavcodec/ppc/dsputil_altivec.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/ppc/idctdsp.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_init.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agomov: Support default-base-is-moof.
Yusuke Nakamura [Tue, 1 Jul 2014 05:17:56 +0000 (14:17 +0900)]
mov: Support default-base-is-moof.

default-base-is-moof shall be set to track fragments compatible with DASH
Media Segments. So, this is a fundamental support for ISOBMFF ver. DASH.
This is meaningful only when base-data-offset-present is absent and two or
more track fragments are present in a movie fragment.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30'
Michael Niedermayer [Tue, 1 Jul 2014 11:12:02 +0000 (13:12 +0200)]
Merge commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30'

* commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30':
  mjpeg: Split off bits shared by MJPEG and LJPEG encoders

Conflicts:
libavcodec/mjpegenc.c
libavcodec/mjpegenc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoUpdate Fiona's name in copyright statements.
Diego Biurrun [Tue, 1 Jul 2014 09:52:37 +0000 (11:52 +0200)]
Update Fiona's name in copyright statements.

5 years agoavfilter/f_ebur128: Use av_malloc_array()
Michael Niedermayer [Tue, 1 Jul 2014 01:50:53 +0000 (03:50 +0200)]
avfilter/f_ebur128: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: Use av_malloc(z)_array()
Michael Niedermayer [Tue, 1 Jul 2014 01:50:17 +0000 (03:50 +0200)]
avcodec/hevc: Use av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocmdutils_opencl: Use av_malloc_array()
Michael Niedermayer [Tue, 1 Jul 2014 01:49:36 +0000 (03:49 +0200)]
cmdutils_opencl: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/showcqt: adding freetype support
Muhammad Faiz [Mon, 30 Jun 2014 03:30:23 +0000 (10:30 +0700)]
avfilter/showcqt: adding freetype support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavdevice/xv: fix missing {
Michael Niedermayer [Mon, 30 Jun 2014 19:31:43 +0000 (21:31 +0200)]
avdevice/xv: fix missing {

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswr: convert resample_common/linear_int16_mmx2/sse2 to yasm.
Ronald S. Bultje [Sun, 29 Jun 2014 23:19:03 +0000 (20:19 -0300)]
swr: convert resample_common/linear_int16_mmx2/sse2 to yasm.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/xv: handle delete window message
Lukasz Marek [Tue, 27 May 2014 20:57:26 +0000 (22:57 +0200)]
lavd/xv: handle delete window message

User may close X11 window by close button on tray.
FFmpeg leaves in graceless way.
This commit detects it and return EPIPE error.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pgssubdec: remove unused variables
Michael Niedermayer [Mon, 30 Jun 2014 16:24:37 +0000 (18:24 +0200)]
avcodec/pgssubdec: remove unused variables

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pgssubdec: Check input buffer size in parse_presentation_segment()
Michael Niedermayer [Mon, 30 Jun 2014 16:23:08 +0000 (18:23 +0200)]
avcodec/pgssubdec: Check input buffer size in parse_presentation_segment()

Might fix overread, no testcase known though.

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