ffmpeg.git
6 years agoMerge commit '728c4658563dc82115ade0f1679679eddb7be5ff'
Michael Niedermayer [Thu, 14 Nov 2013 12:08:36 +0000 (13:08 +0100)]
Merge commit '728c4658563dc82115ade0f1679679eddb7be5ff'

* commit '728c4658563dc82115ade0f1679679eddb7be5ff':
  vdpau: add a constructor for AVVDPAUContext.

Conflicts:
libavcodec/vdpau.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118'
Michael Niedermayer [Thu, 14 Nov 2013 12:00:10 +0000 (13:00 +0100)]
Merge commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118'

* commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118':
  vdpau: add a convenience function for getting a decoder profile.

Conflicts:
doc/APIchanges
libavcodec/vdpau.c
libavcodec/vdpau.h
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vdpau: try to fix version macro use
Michael Niedermayer [Tue, 5 Nov 2013 10:21:14 +0000 (11:21 +0100)]
avcodec/vdpau: try to fix version macro use

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: Do not treat the initial frame special in handling of frame gaps
Michael Niedermayer [Thu, 14 Nov 2013 10:27:45 +0000 (11:27 +0100)]
h264: Do not treat the initial frame special in handling of frame gaps

The not handling of frame gaps has lead to the lack of a dummy reference
frame, which has lead to the failure of decode_slice_header() which has
lead to one SEI recovery message being skiped which had introduced a
slightly suboptimal recovery point for at least 1 h264 file compared to
JM.

Found-by: Carl & BugMaster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: remove avutil.txt
Timothy Gu [Sat, 9 Nov 2013 23:36:41 +0000 (15:36 -0800)]
doc: remove avutil.txt

No useful contents. Also hard to keep up-to-date.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agodoc/libavutil: add things from avutil.txt
Timothy Gu [Thu, 14 Nov 2013 02:56:03 +0000 (18:56 -0800)]
doc/libavutil: add things from avutil.txt

Many minor fixes from: Stefano Sabatini <stefasab@gmail.com>.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agovdpau: add a constructor for AVVDPAUContext.
Anton Khirnov [Sat, 2 Nov 2013 21:01:14 +0000 (22:01 +0100)]
vdpau: add a constructor for AVVDPAUContext.

We will likely want to add new fields to it in the future, so this is
needed to avoid breaking ABI.

6 years agovdpau: add a convenience function for getting a decoder profile.
Anton Khirnov [Fri, 1 Nov 2013 17:37:47 +0000 (18:37 +0100)]
vdpau: add a convenience function for getting a decoder profile.

Based on the code by Rémi Denis-Courmont <remi@remlab.net> from VLC.

6 years agofate: Add VCR2 test
Diego Biurrun [Wed, 13 Nov 2013 17:44:27 +0000 (18:44 +0100)]
fate: Add VCR2 test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompeg12dec: Remove incomplete and wrong UV swapping code for VCR2
Diego Biurrun [Wed, 13 Nov 2013 17:44:25 +0000 (18:44 +0100)]
mpeg12dec: Remove incomplete and wrong UV swapping code for VCR2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo: Fix swapping of UV planes for VCR2
Kostya Shishkov [Wed, 13 Nov 2013 17:44:26 +0000 (18:44 +0100)]
mpegvideo: Fix swapping of UV planes for VCR2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 14 Nov 2013 02:13:39 +0000 (03:13 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Deprecate obsolete XvMC hardware decoding support

Conflicts:
libavcodec/mpeg12.c
libavcodec/mpeg12dec.c
libavcodec/mpegvideo.c
libavcodec/options_table.h
libavutil/pixdesc.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac'
Michael Niedermayer [Thu, 14 Nov 2013 01:39:41 +0000 (02:39 +0100)]
Merge commit 'c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac'

* commit 'c7f7bfc9e3a3150ba72bc34366c13fb2210c66ac':
  Remove all Alpha architecture optimizations

Conflicts:
libavcodec/alpha/asm.h
libavcodec/alpha/dsputil_alpha.c
libavcodec/alpha/dsputil_alpha.h
libavcodec/alpha/dsputil_alpha_asm.S
libavcodec/alpha/hpeldsp_alpha.c
libavcodec/alpha/hpeldsp_alpha.h
libavcodec/alpha/hpeldsp_alpha_asm.S
libavcodec/alpha/motion_est_alpha.c
libavcodec/alpha/motion_est_mvi_asm.S
libavcodec/alpha/mpegvideo_alpha.c
libavcodec/alpha/regdef.h
libavcodec/alpha/simple_idct_alpha.c

We have a qemu based fate alpha client. And various failures
on alpha have previously pointed to issues in generic C code.
Thus IMHO it makes sense to keep alpha code as long as someone
is willing to do the little bit of maintaince it needs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '16381923fb7b9087ce559fb1cd3594469ac6788b'
Michael Niedermayer [Thu, 14 Nov 2013 01:26:26 +0000 (02:26 +0100)]
Merge commit '16381923fb7b9087ce559fb1cd3594469ac6788b'

* commit '16381923fb7b9087ce559fb1cd3594469ac6788b':
  configure: Check whether MSVC requires using the C89-to-C99 converter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/nullenc: mark null as VFPS
Michael Niedermayer [Wed, 13 Nov 2013 21:56:18 +0000 (22:56 +0100)]
avformat/nullenc: mark null as VFPS

This avoids frame duplication for null output
avoiding unneeded computations.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg_opt: fix overriding values set by -target
Michael Niedermayer [Wed, 13 Nov 2013 21:07:19 +0000 (22:07 +0100)]
ffmpeg_opt: fix overriding values set by -target

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoDeprecate obsolete XvMC hardware decoding support
Diego Biurrun [Tue, 5 Nov 2013 07:16:31 +0000 (08:16 +0100)]
Deprecate obsolete XvMC hardware decoding support

XvMC has long ago been superseded by newer acceleration APIs, such as
VDPAU, and few downstreams still support it. Furthermore XvMC is not
implemented within the hwaccel framework, but requires its own specific
code in the MPEG-1/2 decoder, which is a maintenance burden.

6 years agoRemove all Alpha architecture optimizations
Diego Biurrun [Wed, 13 Nov 2013 19:39:56 +0000 (20:39 +0100)]
Remove all Alpha architecture optimizations

Alpha has been end-of-lifed and no more test machines are available.

6 years agoconfigure: Check whether MSVC requires using the C89-to-C99 converter
Martin Storsjö [Mon, 4 Nov 2013 13:46:34 +0000 (15:46 +0200)]
configure: Check whether MSVC requires using the C89-to-C99 converter

MSVC does support enough of C99 to work without the converter since
the 2013 version. Try to detect which version of the compiler in
the path needs to run the C99 converter or not. When the converter
is omitted, compilation time is reduced quite drastically.

Prior to this, users could still use --cc="c99conv -noconv cl"
when running MSVC 2013 to achieve the same.

This checks the version number instead of doing a normal compile
test, since this check needs to be done earlier in configure, before
the normal compile test helpers are usable.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavformat/aviobuf: return error from avio_put_str16le() for invalid input
Michael Niedermayer [Wed, 13 Nov 2013 17:48:38 +0000 (18:48 +0100)]
avformat/aviobuf: return error from avio_put_str16le() for invalid input

Found-by: Stefano Sabatini
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavio_put_str16le: Print error message in case of invalid UTF8 input
Michael Niedermayer [Wed, 13 Nov 2013 17:39:17 +0000 (18:39 +0100)]
avio_put_str16le: Print error message in case of invalid UTF8 input

Found-by: Stefano Sabatini
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mmst: propagate error code from avio_put_str16le()
Michael Niedermayer [Wed, 13 Nov 2013 17:03:32 +0000 (18:03 +0100)]
avformat/mmst: propagate error code from avio_put_str16le()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: remove soc.txt
Timothy Gu [Sat, 9 Nov 2013 23:36:36 +0000 (15:36 -0800)]
doc: remove soc.txt

The file was written in 2006, it was never updated nor really used as
reference for SOC-like programs.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavd/xv: fix memory leak
Lukasz Marek [Tue, 12 Nov 2013 21:38:14 +0000 (22:38 +0100)]
lavd/xv: fix memory leak

Results of XvQueryAdaptors have to be freed with XvFreeAdaptorInfo.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavfi: add elbg filter
Stefano Sabatini [Sun, 10 Nov 2013 22:46:41 +0000 (23:46 +0100)]
lavfi: add elbg filter

6 years agolavc/elbg: rename ff_ symbols to avpriv_, so they can be used in shared libs
Stefano Sabatini [Tue, 12 Nov 2013 11:58:21 +0000 (12:58 +0100)]
lavc/elbg: rename ff_ symbols to avpriv_, so they can be used in shared libs

In particular, allows the use of elbg in other FFmpeg libraries, required
by the pending elbg filter.

6 years agovorbis: handle special packets in the middle of a stream
Ben Boeckel [Mon, 28 Oct 2013 02:47:31 +0000 (22:47 -0400)]
vorbis: handle special packets in the middle of a stream

This allows for updating metadata from new metadata packets in the
middle of a stream (e.g., MPD streams). There still needs to be a signal
that there *is* new metadata, but this is at least gets the data into a
data structure.

Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/vqf: check a few more bits in probe
Michael Niedermayer [Tue, 12 Nov 2013 21:26:34 +0000 (22:26 +0100)]
avformat/vqf: check a few more bits in probe

Fixes probetest failure
The threshold is choosen so that a all printale ascii string will never be
detected as vqf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vp9: use av_freep() for above_partition_ctx
Paul B Mahol [Sun, 10 Nov 2013 19:16:14 +0000 (19:16 +0000)]
avcodec/vp9: use av_freep() for above_partition_ctx

Fixes use after free if memory allocation fails.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavformat/smacker: check width/height in probe
Michael Niedermayer [Tue, 12 Nov 2013 18:37:37 +0000 (19:37 +0100)]
avformat/smacker: check width/height in probe

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpegvideo_motion: Handle edge emulation even without unrestricted_mv
Michael Niedermayer [Tue, 12 Nov 2013 15:11:42 +0000 (16:11 +0100)]
avcodec/mpegvideo_motion: Handle edge emulation even without unrestricted_mv

Fixes out of array reads
Fixes part of: MSVR 440 (the other issues seem to have been fixed already)
Found-by: Jeremy Brown (jerbrown) of ReSP
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: Add 1.2 back to the maintained releases
Michael Niedermayer [Tue, 12 Nov 2013 13:32:53 +0000 (14:32 +0100)]
MAINTAINERS: Add 1.2 back to the maintained releases

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix example in pullup documentation.
Lou Logan [Tue, 12 Nov 2013 13:22:15 +0000 (14:22 +0100)]
Fix example in pullup documentation.

The pullup filter does not work well with the fps filter, it
currently needs -r

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
6 years agolibavcodec/xsubenc.c: set coded_bits_per_sample
Erik Olofsson [Thu, 7 Nov 2013 20:07:11 +0000 (21:07 +0100)]
libavcodec/xsubenc.c: set coded_bits_per_sample

Explicitly set the number of bits per sample to stop
the avi muxer from guessing at 24 bits.
The result is that bits per pixel in the avi stream header
matches what other XSUB muxers produce, such as AVIAddXSubs.exe

Signed-off-by: Erik Olofsson <eaj.olofsson@gmail.com>
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavcodec/xsubenc.c: Fix bounding box coordinates
Erik Olofsson [Thu, 7 Nov 2013 20:07:10 +0000 (21:07 +0100)]
libavcodec/xsubenc.c: Fix bounding box coordinates

Fix coordinates of the lower right corner of the text area.
Note that the coordinates are redundant as the size and
position of the text area are known.
Many decoders (including Sony Playstation 3, VLC and FFmpeg)
ignore the redundant coordinates.
Some hardware decoders need them for correct playback.

Verified on Philips DVD player models HTS7201 and DVP3380.

Fixes ticket #3031

Signed-off-by: Erik Olofsson <eaj.olofsson@gmail.com>
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Mon, 11 Nov 2013 21:29:45 +0000 (22:29 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  libzvbi-teletextdec: propagate errors generated in page handler
  libzvbi-teletextdec: dont ignore memory allocation error silently
  libzvbi-teletextdec: output ass subtitles instead of plain text
  ass: move text_event_to_ass from textdec.c to ass.c and export it
  ass: fix error handling in ff_ass_add_subrect
  ass: factor out ff_ass_bprint_dialog
  libzvbi-teletextdec: use AVBPrint for whitespace cleanup
  libzvbi-teletextdec: use option constants instead of strings
  libzvbi-teletextdec: fix indentation after last commit
  libzvbi-teletextdec: support multiple teletext pages in a single packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 11 Nov 2013 21:21:38 +0000 (22:21 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegaudioenc: Move some static tables to MpegAudioContext

Conflicts:
libavcodec/mpegaudioenc.c
libavcodec/mpegaudiotab.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5d6a990c115850326711c2f5be4d9fd33f399616'
Michael Niedermayer [Mon, 11 Nov 2013 20:46:35 +0000 (21:46 +0100)]
Merge commit '5d6a990c115850326711c2f5be4d9fd33f399616'

* commit '5d6a990c115850326711c2f5be4d9fd33f399616':
  mpegaudioenc: Remove broken integer-only quantization code path

Conflicts:
libavcodec/mpegaudioenc.c

Mostly not merged, the integer code works fine.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/electronicarts: check chunksize more completely in probe()
Michael Niedermayer [Mon, 11 Nov 2013 18:53:22 +0000 (19:53 +0100)]
avformat/electronicarts: check chunksize more completely in probe()

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/electronicarts: check chunk size.
Michael Niedermayer [Mon, 11 Nov 2013 18:51:12 +0000 (19:51 +0100)]
avformat/electronicarts: check chunk size.

Fix infinite loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/dfa: check first frame offset in probe
Michael Niedermayer [Mon, 11 Nov 2013 17:11:43 +0000 (18:11 +0100)]
avformat/dfa: check first frame offset in probe

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/bethsoftvid: check 4th header byte in probe
Michael Niedermayer [Mon, 11 Nov 2013 16:26:03 +0000 (17:26 +0100)]
avformat/bethsoftvid: check 4th header byte in probe

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/avr: check channels and bps in probe
Michael Niedermayer [Mon, 11 Nov 2013 13:51:43 +0000 (14:51 +0100)]
avformat/avr: check channels and bps in probe

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: disabled debug code to collect format probing statistics
Michael Niedermayer [Sat, 9 Nov 2013 15:59:10 +0000 (16:59 +0100)]
avformat/utils: disabled debug code to collect format probing statistics

This allows collecting statistics on probing scores and the amount of data
probing needed for various files and formats.
For example it can be used to find out which formats tend to need more
data for probing or which files are probed with less certain/lower scores

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: delete viterbi.txt
Timothy Gu [Sat, 9 Nov 2013 23:36:37 +0000 (15:36 -0800)]
doc: delete viterbi.txt

The description has been moved to the FFmpeg wiki:
https://trac.ffmpeg.org/wiki/ViterbiAlgorithm

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
6 years agoffmpeg: remove unneeded include "libswscale/swscale.h"
Michael Niedermayer [Sun, 10 Nov 2013 20:42:40 +0000 (21:42 +0100)]
ffmpeg: remove unneeded include "libswscale/swscale.h"

Found-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibzvbi-teletextdec: propagate errors generated in page handler
Marton Balint [Fri, 25 Oct 2013 19:12:23 +0000 (21:12 +0200)]
libzvbi-teletextdec: propagate errors generated in page handler

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agolibzvbi-teletextdec: dont ignore memory allocation error silently
Marton Balint [Fri, 25 Oct 2013 19:02:00 +0000 (21:02 +0200)]
libzvbi-teletextdec: dont ignore memory allocation error silently

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agolibzvbi-teletextdec: output ass subtitles instead of plain text
Marton Balint [Wed, 23 Oct 2013 22:04:05 +0000 (00:04 +0200)]
libzvbi-teletextdec: output ass subtitles instead of plain text

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoavfilter/fade: use FADE_OUT macro.
Clément Bœsch [Sun, 10 Nov 2013 18:16:45 +0000 (19:16 +0100)]
avfilter/fade: use FADE_OUT macro.

6 years agoavfilter/fade: remove a bunch of useless parenthesis.
Clément Bœsch [Sun, 10 Nov 2013 18:15:19 +0000 (19:15 +0100)]
avfilter/fade: remove a bunch of useless parenthesis.

6 years agoavfilter/fade: use inlink->frame_count.
Clément Bœsch [Sun, 10 Nov 2013 18:12:36 +0000 (19:12 +0100)]
avfilter/fade: use inlink->frame_count.

6 years agoavfilter/fade: add color option.
Clément Bœsch [Fri, 8 Nov 2013 22:59:40 +0000 (23:59 +0100)]
avfilter/fade: add color option.

Fixes Ticket #1822.

6 years agoass: move text_event_to_ass from textdec.c to ass.c and export it
Marton Balint [Wed, 23 Oct 2013 18:03:17 +0000 (20:03 +0200)]
ass: move text_event_to_ass from textdec.c to ass.c and export it

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoass: fix error handling in ff_ass_add_subrect
Marton Balint [Wed, 23 Oct 2013 09:27:25 +0000 (11:27 +0200)]
ass: fix error handling in ff_ass_add_subrect

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoass: factor out ff_ass_bprint_dialog
Marton Balint [Wed, 23 Oct 2013 09:20:04 +0000 (11:20 +0200)]
ass: factor out ff_ass_bprint_dialog

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agolibzvbi-teletextdec: use AVBPrint for whitespace cleanup
Marton Balint [Wed, 23 Oct 2013 21:15:54 +0000 (23:15 +0200)]
libzvbi-teletextdec: use AVBPrint for whitespace cleanup

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agolibzvbi-teletextdec: use option constants instead of strings
Marton Balint [Sun, 20 Oct 2013 18:50:54 +0000 (20:50 +0200)]
libzvbi-teletextdec: use option constants instead of strings

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agolibzvbi-teletextdec: fix indentation after last commit
Marton Balint [Sun, 29 Sep 2013 13:23:37 +0000 (15:23 +0200)]
libzvbi-teletextdec: fix indentation after last commit

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agolibzvbi-teletextdec: support multiple teletext pages in a single packet
Marton Balint [Sun, 28 Jul 2013 20:07:01 +0000 (22:07 +0200)]
libzvbi-teletextdec: support multiple teletext pages in a single packet

After this patch, if a packet contains multiple teletext pages, the teletext
decoder can return the fist page and store the remaining pages in memory, and
return them to the user on the next calls to avcodec_decode_subtitle2.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 10 Nov 2013 16:37:51 +0000 (17:37 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hwaccel: Simplify ff_find_hwaccel

Conflicts:
libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegaudioenc: Move some static tables to MpegAudioContext
Diego Biurrun [Mon, 4 Nov 2013 20:14:03 +0000 (21:14 +0100)]
mpegaudioenc: Move some static tables to MpegAudioContext

This reduces global state and the amount of globally visible tables.

6 years agompegaudioenc: Remove broken integer-only quantization code path
Diego Biurrun [Sat, 9 Nov 2013 13:17:16 +0000 (14:17 +0100)]
mpegaudioenc: Remove broken integer-only quantization code path

6 years agoavformat/diracdec: check 2 chunks in probe
Michael Niedermayer [Sun, 10 Nov 2013 15:04:33 +0000 (16:04 +0100)]
avformat/diracdec: check 2 chunks in probe

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohwaccel: Simplify ff_find_hwaccel
Luca Barbato [Sat, 9 Nov 2013 16:07:34 +0000 (17:07 +0100)]
hwaccel: Simplify ff_find_hwaccel

It is always called by passing fields from an AVCodecContext.

6 years agoavformat/astdec: increase the score for odd samplerate/channels to max/8
Michael Niedermayer [Sun, 10 Nov 2013 12:10:23 +0000 (13:10 +0100)]
avformat/astdec: increase the score for odd samplerate/channels to max/8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/rsd: increase the score for odd samplerate/channels to max/8
Michael Niedermayer [Sun, 10 Nov 2013 12:10:23 +0000 (13:10 +0100)]
avformat/rsd: increase the score for odd samplerate/channels to max/8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/lvfdec: increase the score for odd channels to max/8
Michael Niedermayer [Sun, 10 Nov 2013 12:10:23 +0000 (13:10 +0100)]
avformat/lvfdec: increase the score for odd channels to max/8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/swfdec: return AVPROBE_SCORE_MAX / 4 for unexpected versions
Michael Niedermayer [Sun, 10 Nov 2013 11:53:38 +0000 (12:53 +0100)]
avformat/swfdec: return AVPROBE_SCORE_MAX / 4 for unexpected versions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/ape: check version in probe
Michael Niedermayer [Sun, 10 Nov 2013 11:48:33 +0000 (12:48 +0100)]
avformat/ape: check version in probe

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/encoders: fix libfdk-aac "Examples" subsection
Timothy Gu [Sat, 9 Nov 2013 23:04:36 +0000 (15:04 -0800)]
doc/encoders: fix libfdk-aac "Examples" subsection

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agoavcodec/vp8: remove unused webp_decode_frame()
Michael Niedermayer [Sun, 10 Nov 2013 11:21:54 +0000 (12:21 +0100)]
avcodec/vp8: remove unused webp_decode_frame()

See: libavcodec/webp.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/dv: remove unused variable
Michael Niedermayer [Sun, 10 Nov 2013 11:20:40 +0000 (12:20 +0100)]
avformat/dv: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/doxy-wrapper: disable inserting headers and footers
Timothy Gu [Sat, 9 Nov 2013 23:20:15 +0000 (15:20 -0800)]
doc/doxy-wrapper: disable inserting headers and footers

The headers and footers are used to integrate Doxygen into Libav's website.
Fixes the Libav-ish look when doing `make apidoc`.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/thp: check fps value during probing
Michael Niedermayer [Sun, 10 Nov 2013 00:42:22 +0000 (01:42 +0100)]
avformat/thp: check fps value during probing

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/thp: do not set sample_rate for a video codec
Michael Niedermayer [Sun, 10 Nov 2013 00:28:32 +0000 (01:28 +0100)]
avformat/thp: do not set sample_rate for a video codec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9: fix mvref finding to adhere to bug in libvpx.
Ronald S. Bultje [Sat, 9 Nov 2013 15:52:49 +0000 (10:52 -0500)]
vp9: fix mvref finding to adhere to bug in libvpx.

Fixes a particular youtube video that I unfortunately can't share.

6 years agolibavf/avienc: store language metadata for XSUB streams
Erik Olofsson [Sat, 9 Nov 2013 19:26:00 +0000 (20:26 +0100)]
libavf/avienc: store language metadata for XSUB streams

Formatted in such a way that DivX certified players can decode it.
Verified on Sony Playstation 3 and Philips DVP3380.

Fixes ticket 2385

Signed-off-by: Erik Olofsson <eaj.olofsson@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: generate more specific error message in case of inconsistent filtering options
Stefano Sabatini [Mon, 4 Nov 2013 09:05:24 +0000 (10:05 +0100)]
ffmpeg: generate more specific error message in case of inconsistent filtering options

In particular, distinguish if the option was -filter or -filter_script.

Suggested-by: Nicolas George
6 years agoffmpeg: store value of -filter and -filter_script per-stream option in OutputStream...
Stefano Sabatini [Mon, 4 Nov 2013 09:02:27 +0000 (10:02 +0100)]
ffmpeg: store value of -filter and -filter_script per-stream option in OutputStream struct

Avoid the need for multiple potentially inconsistent access operations,
slightly factorize code.

6 years agoavformat/dv: consider a header match at byte 0 to count as detection of dv in probe
Michael Niedermayer [Sat, 9 Nov 2013 16:31:35 +0000 (17:31 +0100)]
avformat/dv: consider a header match at byte 0 to count as detection of dv in probe

This reduces the amount of data needed to identify dv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegts: only calculate stat index when its needed during probe
Michael Niedermayer [Sat, 9 Nov 2013 15:09:26 +0000 (16:09 +0100)]
mpegts: only calculate stat index when its needed during probe

40% faster probe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mpegts: do not hardcode type used in memset()
Michael Niedermayer [Sat, 9 Nov 2013 15:03:41 +0000 (16:03 +0100)]
avformat/mpegts: do not hardcode type used in memset()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/dv: about 3 times faster probe
Michael Niedermayer [Sat, 9 Nov 2013 13:43:51 +0000 (14:43 +0100)]
avformat/dv: about 3 times faster probe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: avoid stdin stall with GNU AS probing.
Clément Bœsch [Fri, 8 Nov 2013 22:55:06 +0000 (23:55 +0100)]
build: avoid stdin stall with GNU AS probing.

a758c5e added probing for various tools, such as AS. Unfortunately, GNU
AS is reading stdin with -v, and thus configure is stalled with
configure arguments such as --as=as.

Fixes Ticket #1898.

6 years agoriff: add VP9 fourcc
James Zern [Sat, 9 Nov 2013 04:16:17 +0000 (20:16 -0800)]
riff: add VP9 fourcc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mp3dec: 4x faster probing
Michael Niedermayer [Sat, 9 Nov 2013 00:45:24 +0000 (01:45 +0100)]
avformat/mp3dec: 4x faster probing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/h261dec: dont accept invalid gobs in probe as valid
Michael Niedermayer [Sat, 9 Nov 2013 00:12:10 +0000 (01:12 +0100)]
avformat/h261dec: dont accept invalid gobs in probe as valid

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/h261dec: optimize probe
Michael Niedermayer [Fri, 8 Nov 2013 23:30:27 +0000 (00:30 +0100)]
avformat/h261dec: optimize probe

about 3 times faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 8 Nov 2013 23:10:04 +0000 (00:10 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avienc: drop the vfr flag.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: treat avi as VFR in framerate conversion code
Michael Niedermayer [Fri, 8 Nov 2013 23:03:27 +0000 (00:03 +0100)]
ffmpeg: treat avi as VFR in framerate conversion code

It can be debated if avi is vfr or cfr, it can be either depending
on the definition of vfr and cfr.
This commit ensures that avi is treated correctly independent of
the AVFMT_VARIABLE_FPS value.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45'
Michael Niedermayer [Fri, 8 Nov 2013 22:36:59 +0000 (23:36 +0100)]
Merge commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45'

* commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45':
  metasound: Fix error message argument

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mxfdec: optimize probing
Michael Niedermayer [Fri, 8 Nov 2013 20:43:27 +0000 (21:43 +0100)]
avformat/mxfdec: optimize probing

about 71 times faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotools/probetest: also print the time the probe functions needed
Michael Niedermayer [Fri, 8 Nov 2013 20:15:24 +0000 (21:15 +0100)]
tools/probetest: also print the time the probe functions needed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotools/probetest: use named constant for the maximum number of formats
Michael Niedermayer [Fri, 8 Nov 2013 19:42:13 +0000 (20:42 +0100)]
tools/probetest: use named constant for the maximum number of formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavienc: drop the vfr flag.
Anton Khirnov [Thu, 7 Nov 2013 21:02:00 +0000 (22:02 +0100)]
avienc: drop the vfr flag.

AVI does not really support vfr properly, only by padding with null
packets.

6 years agoavcodec/mimic: use av_freep() and reset swap_buf_size
Paul B Mahol [Fri, 8 Nov 2013 14:23:45 +0000 (14:23 +0000)]
avcodec/mimic: use av_freep() and reset swap_buf_size

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec/vmdav: use av_freep() and reset unpack_buffer_size
Paul B Mahol [Fri, 8 Nov 2013 14:15:31 +0000 (14:15 +0000)]
avcodec/vmdav: use av_freep() and reset unpack_buffer_size

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavformat/icodec: reduce score returned on probing
Michael Niedermayer [Fri, 8 Nov 2013 19:10:33 +0000 (20:10 +0100)]
avformat/icodec: reduce score returned on probing

The ico probe function is pretty weak just checking a few bytes for being 0, 1 or not 0

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 8 Nov 2013 17:00:56 +0000 (18:00 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h263dsp: K&R formatting cosmetics

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