ffmpeg.git
6 years agoMerge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'
Michael Niedermayer [Mon, 6 May 2013 08:19:56 +0000 (10:19 +0200)]
Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'

* commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43':
  avformat: Add av_cold attributes to init functions missing them

Conflicts:
libavformat/rtpdec_xiph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoid3v2: stop ignoring text encoding for chapter titles
Paul B Mahol [Mon, 6 May 2013 00:54:13 +0000 (00:54 +0000)]
id3v2: stop ignoring text encoding for chapter titles

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoh264: check mb_width/height
Michael Niedermayer [Sun, 5 May 2013 23:37:34 +0000 (01:37 +0200)]
h264: check mb_width/height

Fixes inconsistency that leads to out of array accesses with threads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoff_h264_decode_seq_parameter_set: dont set h->sps
Michael Niedermayer [Sun, 5 May 2013 22:03:57 +0000 (00:03 +0200)]
ff_h264_decode_seq_parameter_set: dont set h->sps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264_sei/decode_picture_timing: do not depend on h->sps being set
Michael Niedermayer [Sun, 5 May 2013 22:27:58 +0000 (00:27 +0200)]
h264_sei/decode_picture_timing: do not depend on h->sps being set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoff_h264_decode_picture_parameter_set: fix return code
Michael Niedermayer [Sun, 5 May 2013 22:01:47 +0000 (00:01 +0200)]
ff_h264_decode_picture_parameter_set: fix return code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoff_h264_decode_picture_parameter_set: use the correct sps
Michael Niedermayer [Sun, 5 May 2013 22:01:05 +0000 (00:01 +0200)]
ff_h264_decode_picture_parameter_set: use the correct sps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoCosmetics: Reindent Sierra vmd demuxer after last commit.
Carl Eugen Hoyos [Sun, 5 May 2013 17:56:46 +0000 (19:56 +0200)]
Cosmetics: Reindent Sierra vmd demuxer after last commit.

6 years agoSupport demuxing of audio-only vmd files.
Carl Eugen Hoyos [Sun, 5 May 2013 17:52:30 +0000 (19:52 +0200)]
Support demuxing of audio-only vmd files.

Reviewed-by: Paul B Mahol
6 years agoFix type of shared flac table ff_flac_blocksize_table[].
Carl Eugen Hoyos [Sun, 5 May 2013 17:29:00 +0000 (19:29 +0200)]
Fix type of shared flac table ff_flac_blocksize_table[].

Fixes ticket #2533.

6 years agoavformat: Add av_cold attributes to init functions missing them
Diego Biurrun [Thu, 18 Apr 2013 13:54:26 +0000 (15:54 +0200)]
avformat: Add av_cold attributes to init functions missing them

6 years agoMerge branch 'vdpau' of https://github.com/FernetMenta/FFmpeg
Michael Niedermayer [Sun, 5 May 2013 14:28:09 +0000 (16:28 +0200)]
Merge branch 'vdpau' of https://github.com/FernetMenta/FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Use the tool specified with --valgrind instead of a hardcoded "valgrind"
Michael Niedermayer [Sun, 5 May 2013 14:22:44 +0000 (16:22 +0200)]
configure: Use the tool specified with --valgrind instead of a hardcoded "valgrind"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: set valgrind-memcheck toolchain when --valgrind is specified
Michael Niedermayer [Sun, 5 May 2013 14:21:57 +0000 (16:21 +0200)]
configure: set valgrind-memcheck toolchain when --valgrind is specified

This avoids duplicating the default command line arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoregister AV_PIX_FMT_VDPAU for hwaccel
Rainer Hochecker [Sun, 5 May 2013 14:15:41 +0000 (16:15 +0200)]
register AV_PIX_FMT_VDPAU for hwaccel

6 years agofix vdpau vc1 interlace modes
Rainer Hochecker [Sun, 5 May 2013 13:12:59 +0000 (15:12 +0200)]
fix vdpau vc1 interlace modes

6 years agoavcodec: Set frame.width/height on all exit pathes of ff_get_buffer()
Michael Niedermayer [Sun, 5 May 2013 12:23:16 +0000 (14:23 +0200)]
avcodec: Set frame.width/height on all exit pathes of ff_get_buffer()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/opencl: add opencl public error API
highgod0401 [Sun, 28 Apr 2013 00:47:20 +0000 (08:47 +0800)]
lavu/opencl: add opencl public error API

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y
Michael Niedermayer [Sun, 5 May 2013 11:16:53 +0000 (13:16 +0200)]
avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y

Demuxers where the changed code looked less readable where skiped

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomake the ordering of the return type and av_cold consistent
Michael Niedermayer [Sun, 5 May 2013 11:13:00 +0000 (13:13 +0200)]
make the ordering of the return type and av_cold consistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 5 May 2013 11:05:38 +0000 (13:05 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Check for getenv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70'
Michael Niedermayer [Sun, 5 May 2013 11:00:21 +0000 (13:00 +0200)]
Merge commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70'

* commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70':
  swscale: Add av_cold attributes to init functions missing them

Conflicts:
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1fda184a85178cfd7b98d9e308d18e1ded76a511'
Michael Niedermayer [Sun, 5 May 2013 10:53:42 +0000 (12:53 +0200)]
Merge commit '1fda184a85178cfd7b98d9e308d18e1ded76a511'

* commit '1fda184a85178cfd7b98d9e308d18e1ded76a511':
  avutil: Add av_cold attributes to init functions missing them

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '20c86571ccc71412781d4a4813e4693e0c42aec6'
Michael Niedermayer [Sun, 5 May 2013 10:48:25 +0000 (12:48 +0200)]
Merge commit '20c86571ccc71412781d4a4813e4693e0c42aec6'

* commit '20c86571ccc71412781d4a4813e4693e0c42aec6':
  lavfi: let gcc realign the stack on public graph driving functions

Conflicts:
libavfilter/buffersink.c
libavfilter/buffersrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f'
Michael Niedermayer [Sun, 5 May 2013 10:41:36 +0000 (12:41 +0200)]
Merge commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f'

* commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f':
  sctp: Add a note on why sctp_recvmsg and sctp_sendmsg have ff_-prefixes
  avs: Increase magic value score above file extension score

Conflicts:
libavformat/avs.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'
Michael Niedermayer [Sun, 5 May 2013 10:29:56 +0000 (12:29 +0200)]
Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

* commit 'e0f8be6413b6a8d334d6052e610af32935c310af':
  avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate

Conflicts:
libavformat/ac3dec.c
libavformat/avformat.h
libavformat/avs.c
libavformat/m4vdec.c
libavformat/mov.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegvideodec.c
libavformat/psxstr.c
libavformat/pva.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4d7ed3e73541983459a7913c2034eba69ebc113d'
Michael Niedermayer [Sun, 5 May 2013 09:59:20 +0000 (11:59 +0200)]
Merge commit '4d7ed3e73541983459a7913c2034eba69ebc113d'

* commit '4d7ed3e73541983459a7913c2034eba69ebc113d':
  build: output-example: Add avutil to ELIBS in link command

Conflicts:
libavformat/Makefile

No change as our example build code doesnt have this bug

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd'
Michael Niedermayer [Sun, 5 May 2013 09:50:29 +0000 (11:50 +0200)]
Merge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd'

* commit 'e445647b4fdf481b13b2743b303d84de4f43bedd':
  avresample: Add av_cold attributes to init functions missing them

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '093804a93cc5da3f95f98265a5df116912443cec'
Michael Niedermayer [Sun, 5 May 2013 09:42:18 +0000 (11:42 +0200)]
Merge commit '093804a93cc5da3f95f98265a5df116912443cec'

* commit '093804a93cc5da3f95f98265a5df116912443cec':
  avfilter: Add av_cold attributes to init/uninit functions

Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/af_volume.c
libavfilter/src_movie.c
libavfilter/vf_lut.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'
Michael Niedermayer [Sun, 5 May 2013 09:34:29 +0000 (11:34 +0200)]
Merge commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487'

* commit '6fee1b90ce3bf4fbdfde7016e0890057c9000487':
  avcodec: Add av_cold attributes to init functions missing them

Conflicts:
libavcodec/aacpsy.c
libavcodec/atrac3.c
libavcodec/dvdsubdec.c
libavcodec/ffv1.c
libavcodec/ffv1enc.c
libavcodec/h261enc.c
libavcodec/h264_parser.c
libavcodec/h264dsp.c
libavcodec/h264pred.c
libavcodec/libschroedingerenc.c
libavcodec/libxvid_rc.c
libavcodec/mpeg12.c
libavcodec/mpeg12enc.c
libavcodec/proresdsp.c
libavcodec/rangecoder.c
libavcodec/videodsp.c
libavcodec/x86/proresdsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '72e228b274a98af1aba9588415d0cd87fde44663'
Michael Niedermayer [Sun, 5 May 2013 09:19:12 +0000 (11:19 +0200)]
Merge commit '72e228b274a98af1aba9588415d0cd87fde44663'

* commit '72e228b274a98af1aba9588415d0cd87fde44663':
  nut: K&R formatting cosmetics

Conflicts:
libavformat/nut.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: fix valgrind-memcheck arguments
Michael Niedermayer [Sun, 5 May 2013 08:48:33 +0000 (10:48 +0200)]
configure: fix valgrind-memcheck arguments

They now match the --valgrind arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a'
Michael Niedermayer [Sun, 5 May 2013 08:47:19 +0000 (10:47 +0200)]
Merge commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a'

* commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a':
  configure: Add basic valgrind-memcheck support

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07'
Michael Niedermayer [Sun, 5 May 2013 08:36:23 +0000 (10:36 +0200)]
Merge commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07'

* commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07':
  build: normalize coverage.info

Conflicts:
tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '768e44d044bc32de1e58c198a3708d186af7e966'
Michael Niedermayer [Sun, 5 May 2013 08:18:41 +0000 (10:18 +0200)]
Merge commit '768e44d044bc32de1e58c198a3708d186af7e966'

* commit '768e44d044bc32de1e58c198a3708d186af7e966':
  build: tune down the output of lcov/gcov

Conflicts:
tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoDetect and skip mj2-style jp2c header.
Reimar Döffinger [Thu, 2 May 2013 21:56:19 +0000 (23:56 +0200)]
Detect and skip mj2-style jp2c header.

This this fixes one of the issues with
http://blogs.bu.edu/mhirsch/files/2012/08/Rotate180CCW-checkerboard.mj2_.zip
and at least allows to demux the file properly instead
of failing during probing.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoAvoid incorrect deprecated pixel format warning.
Reimar Döffinger [Thu, 2 May 2013 21:52:44 +0000 (23:52 +0200)]
Avoid incorrect deprecated pixel format warning.

Should only be printed if a "JPEG" format was used,
not for e.g. XYZ.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agoAAC encoder: Fix rate control on twoloop.
Claudio Freire [Sat, 4 May 2013 21:36:37 +0000 (18:36 -0300)]
AAC encoder: Fix rate control on twoloop.

Fixes a case where multichannel bitrate isn't accurately
targetted by psy model alone, never achieving the target bitrate.
Now fixed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAAC encoder: Fixed a rounding bug in psy's channel bitrate computation.
Claudio Freire [Sat, 4 May 2013 21:35:49 +0000 (18:35 -0300)]
AAC encoder: Fixed a rounding bug in psy's channel bitrate computation.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosrc_movie: fix scanf string
Michael Niedermayer [Sat, 4 May 2013 22:56:39 +0000 (00:56 +0200)]
src_movie: fix scanf string

Fixes out of array accesses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoxbmdec: fix off by one error in scanf()
Michael Niedermayer [Sat, 4 May 2013 22:23:13 +0000 (00:23 +0200)]
xbmdec: fix off by one error in scanf()

Fixes out of array access

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Check for getenv
Martin Storsjö [Fri, 30 Nov 2012 09:16:58 +0000 (11:16 +0200)]
configure: Check for getenv

When targeting the "windows store application" (metro) API subset
(or the windows phone API subset), the getenv function isn't
available. If it is unavailable, just define getenv to NULL.

The check uses check_func_headers, since the function actually
might exist in the libraries, but is hidden in the headers.

The fallback is in config.h since msvc can't do -D defines with
parameters on the command line, and it's used both within the
libraries and the frontend applications (so a libavutil internal
header wouldn't be enough).

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoswscale: Add av_cold attributes to init functions missing them
Diego Biurrun [Thu, 18 Apr 2013 13:54:45 +0000 (15:54 +0200)]
swscale: Add av_cold attributes to init functions missing them

6 years agoavutil: Add av_cold attributes to init functions missing them
Diego Biurrun [Tue, 30 Apr 2013 16:31:25 +0000 (18:31 +0200)]
avutil: Add av_cold attributes to init functions missing them

6 years agolavfi: let gcc realign the stack on public graph driving functions
Hendrik Leppkes [Fri, 15 Mar 2013 19:44:57 +0000 (20:44 +0100)]
lavfi: let gcc realign the stack on public graph driving functions

The functions which actually drive the filter graph by pushing
frames through it need to ensure an aligned stack for SIMD functions.

This fixes a crash in YADIF filter when using a mingw build in a MSVC
application.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosctp: Add a note on why sctp_recvmsg and sctp_sendmsg have ff_-prefixes
Diego Biurrun [Mon, 22 Apr 2013 17:03:13 +0000 (19:03 +0200)]
sctp: Add a note on why sctp_recvmsg and sctp_sendmsg have ff_-prefixes

6 years agoavs: Increase magic value score above file extension score
Diego Biurrun [Mon, 25 Mar 2013 15:14:55 +0000 (16:14 +0100)]
avs: Increase magic value score above file extension score

This should fix misdetection of AVS files as AviSynth scripts
when AviSynth support is enabled (Bugzilla #357).

6 years agoavformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate
Diego Biurrun [Mon, 25 Mar 2013 15:12:51 +0000 (16:12 +0100)]
avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate

6 years agobuild: output-example: Add avutil to ELIBS in link command
Diego Biurrun [Sat, 27 Apr 2013 12:51:27 +0000 (14:51 +0200)]
build: output-example: Add avutil to ELIBS in link command

output-example links against swscale, which depends on avutil.  In standard
configurations, by pure good luck, the libs before swscale pull in all of
swscale's dependencies and linking succeeds.  However, in some configurations
like --disable-asm this is not the case and linking fails.

Hardcode the dependency to avoid a more general Makefile refactoring.

6 years agoavresample: Add av_cold attributes to init functions missing them
Diego Biurrun [Tue, 30 Apr 2013 16:30:48 +0000 (18:30 +0200)]
avresample: Add av_cold attributes to init functions missing them

6 years agoavfilter: Add av_cold attributes to init/uninit functions
Diego Biurrun [Tue, 30 Apr 2013 16:30:02 +0000 (18:30 +0200)]
avfilter: Add av_cold attributes to init/uninit functions

6 years agoavcodec: Add av_cold attributes to init functions missing them
Diego Biurrun [Fri, 1 Feb 2013 09:31:59 +0000 (10:31 +0100)]
avcodec: Add av_cold attributes to init functions missing them

6 years agoh264: Always decode MMCOs into temprary array
Michael Niedermayer [Sat, 4 May 2013 18:21:47 +0000 (20:21 +0200)]
h264: Always decode MMCOs into temprary array

When decoding succeeded the array is copied into the permanent one.
This prevents inconsistencies
Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonut: K&R formatting cosmetics
Luca Barbato [Sat, 4 May 2013 09:10:14 +0000 (11:10 +0200)]
nut: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Sat, 4 May 2013 14:58:41 +0000 (16:58 +0200)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavf/matroskaenc: return an error for unsupported types.
  lavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD.
  lavf: filter out AVSEEK_FLAG_BACKWARD in new API.
  lavf: call the new seek API from the old.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowmaprodec: Fix null pointer dereference in decode_frame()
Michael Niedermayer [Sat, 4 May 2013 14:49:47 +0000 (16:49 +0200)]
wmaprodec: Fix null pointer dereference in decode_frame()

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodfa: Put our pointer check back.
Michael Niedermayer [Sat, 4 May 2013 12:37:22 +0000 (14:37 +0200)]
dfa: Put our pointer check back.

The reimplementation by Libav does not prevent out of array
writes, even though it looks like it does at a quick glance.

No FFmpeg releases are affected by this

See: d1c95d2ce39560e251fdb14f4af91b04fd7b845c
     3623589edc7b1257bb45aa9e52c9631e133f22b6
     740ebe468c0567cac03ef7e6b4b9fd0253b97da2

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/matroskaenc: return an error for unsupported types.
Nicolas George [Mon, 29 Apr 2013 18:45:22 +0000 (20:45 +0200)]
lavf/matroskaenc: return an error for unsupported types.

6 years agolavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD.
Nicolas George [Fri, 3 May 2013 08:32:45 +0000 (10:32 +0200)]
lavf/concatdec: remove invalid check for AVSEEK_FLAG_BACKWARD.

6 years agolavf: filter out AVSEEK_FLAG_BACKWARD in new API.
Nicolas George [Fri, 3 May 2013 08:31:33 +0000 (10:31 +0200)]
lavf: filter out AVSEEK_FLAG_BACKWARD in new API.

Also document that it has no effect.

6 years agolavf: call the new seek API from the old.
Nicolas George [Mon, 29 Apr 2013 21:58:22 +0000 (23:58 +0200)]
lavf: call the new seek API from the old.

If the demuxer implements read_seek2() and not read_seek(),
call avformat_seek_file() from av_seek_frame().
Allow to properly seek in formats that only implement the
new API from applications that use the old one.
Tested with mplayer and a concat script.

6 years agoaacdec: free frame buffer if no audio was decoded
Hendrik Leppkes [Sat, 4 May 2013 09:17:00 +0000 (11:17 +0200)]
aacdec: free frame buffer if no audio was decoded

If no decoding error was detected, but still no audio was decoded, the
frame needs to be free'ed, or it will leak.

Fixes part of ticket #2095

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Add basic valgrind-memcheck support
Reinhard Tartler [Sat, 4 May 2013 08:25:41 +0000 (10:25 +0200)]
configure: Add basic valgrind-memcheck support

With the parameter --valgrind-memcheck, the configure script sets
reasonable defaults that can be overridden as explained in the
documentation.

The idea of using set_defaults is from Luca Barbato.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 4 May 2013 08:33:50 +0000 (10:33 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wav: return meaningful errors

Conflicts:
libavformat/wavdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'
Michael Niedermayer [Sat, 4 May 2013 08:17:52 +0000 (10:17 +0200)]
Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'

* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7':
  silly typo fixes

Conflicts:
doc/protocols.texi
libavcodec/aacpsy.c
libavformat/utils.c
tools/patcheck

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4a7af92cc80ced8498626401ed21f25ffe6740c8'
Michael Niedermayer [Sat, 4 May 2013 08:06:10 +0000 (10:06 +0200)]
Merge commit '4a7af92cc80ced8498626401ed21f25ffe6740c8'

* commit '4a7af92cc80ced8498626401ed21f25ffe6740c8':
  sbrdsp: Unroll and use integer operations
  sbrdsp: Unroll sbr_autocorrelate_c
  x86: sbrdsp: Implement SSE2 qmf_deint_bfly

Conflicts:
libavcodec/sbrdsp.c
libavcodec/x86/sbrdsp.asm
libavcodec/x86/sbrdsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: normalize coverage.info
Reinhard Tartler [Sun, 21 Apr 2013 17:10:26 +0000 (19:10 +0200)]
build: normalize coverage.info

Without this, lcov sometimes misses to normalize paths that contain "/./".
Also, ignore uninteresting hits in system headers.

6 years agobuild: tune down the output of lcov/gcov
Reinhard Tartler [Sun, 21 Apr 2013 17:08:59 +0000 (19:08 +0200)]
build: tune down the output of lcov/gcov

In the default settings, both tools produce a lot of unhelpful noise.

6 years agoevrcdec: fix sign error
Michael Niedermayer [Sat, 4 May 2013 00:47:58 +0000 (02:47 +0200)]
evrcdec: fix sign error

The specification wants round(abs(x))) * sign(x) which is
equivakent to round(x)

Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosnow: Fix off by 1 error in reference picture management
Michael Niedermayer [Fri, 3 May 2013 23:11:08 +0000 (01:11 +0200)]
snow: Fix off by 1 error in reference picture management

Fixes out of array accesses
No release is affected by this bug

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoeamad: Check against minimum supported dimensions
Michael Niedermayer [Fri, 3 May 2013 21:16:54 +0000 (23:16 +0200)]
eamad: Check against minimum supported dimensions

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/filters: document asetpts in single place
Paul B Mahol [Thu, 2 May 2013 22:14:59 +0000 (22:14 +0000)]
doc/filters: document asetpts in single place

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agowav: return meaningful errors
Luca Barbato [Thu, 2 May 2013 20:40:25 +0000 (22:40 +0200)]
wav: return meaningful errors

6 years agolavu: add planar 16 bit and 8 bit rgb with alpha
Paul B Mahol [Sat, 23 Feb 2013 19:29:31 +0000 (19:29 +0000)]
lavu: add planar 16 bit and 8 bit rgb with alpha

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/testsrc: add support for color interactive command
Stefano Sabatini [Wed, 24 Apr 2013 09:14:27 +0000 (11:14 +0200)]
lavfi/testsrc: add support for color interactive command

6 years agoextractplanes filter
Paul B Mahol [Tue, 30 Apr 2013 12:12:12 +0000 (12:12 +0000)]
extractplanes filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agosilly typo fixes
Diego Biurrun [Mon, 20 Aug 2012 23:02:13 +0000 (01:02 +0200)]
silly typo fixes

6 years agosbrdsp: Unroll and use integer operations
Christophe Gisquet [Tue, 9 Apr 2013 21:57:10 +0000 (21:57 +0000)]
sbrdsp: Unroll and use integer operations

This patch can be controversial, by assuming floats are IEEE-754 and
particular behaviour of the FPU will get in the way.
Timing on Arrandale and Win32 (thus, x87 FPU is used in the reference).

sbr_qmf_pre_shuffle_c: 115 to 76
sbr_neg_odd_64_c: 84 to 55
sbr_qmf_post_shuffle_c: 112 to 83

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agosbrdsp: Unroll sbr_autocorrelate_c
Christophe Gisquet [Tue, 9 Apr 2013 21:57:09 +0000 (21:57 +0000)]
sbrdsp: Unroll sbr_autocorrelate_c

1410 cycles to 1148 on Arrandale/Win64

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agox86: sbrdsp: Implement SSE2 qmf_deint_bfly
Christophe Gisquet [Tue, 9 Apr 2013 21:57:07 +0000 (21:57 +0000)]
x86: sbrdsp: Implement SSE2 qmf_deint_bfly

Sandybridge: 47 cycles

Having a loop counter is a 7 cycle gain.
Unrolling is another 7 cycle gain.
Working in reverse scan is another 6 cycles.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agovc1dec: fix lutuv use in vc1_mc_4mv_chroma4()
Michael Niedermayer [Fri, 3 May 2013 16:09:15 +0000 (18:09 +0200)]
vc1dec: fix lutuv use in vc1_mc_4mv_chroma4()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1dec: Fix mixed field/frame intensity compensation
Michael Niedermayer [Fri, 3 May 2013 15:44:30 +0000 (17:44 +0200)]
vc1dec: Fix mixed field/frame intensity compensation

Fixes Ticket2523

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1dec: vc1_mc_4mv_chroma4: match addressing between compensation and MC
Michael Niedermayer [Wed, 24 Apr 2013 18:42:07 +0000 (20:42 +0200)]
vc1dec: vc1_mc_4mv_chroma4: match addressing between compensation and MC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/frei0r: fix crash when parameters are not set.
Clément Bœsch [Fri, 3 May 2013 15:03:12 +0000 (17:03 +0200)]
lavfi/frei0r: fix crash when parameters are not set.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 3 May 2013 13:38:46 +0000 (15:38 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  compat: msvc: Make sure the object files are included when linking statically
  id3v2: check for end of file while unescaping tags

Conflicts:
configure
libavformat/id3v2.c

Note, ffmpeg is not affected by the out of buffer write bug

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: drop old non monotone dts workaround.
Michael Niedermayer [Fri, 3 May 2013 13:04:47 +0000 (15:04 +0200)]
ffmpeg: drop old non monotone dts workaround.

All bugs should now be fixed in the new so the old can be droped.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: set correct log context for non monotone dts workaround warnings
Michael Niedermayer [Fri, 3 May 2013 13:03:35 +0000 (15:03 +0200)]
ffmpeg: set correct log context for non monotone dts workaround warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: port loglevel selection code to new dts workaround code
Michael Niedermayer [Fri, 3 May 2013 13:02:43 +0000 (15:02 +0200)]
ffmpeg: port loglevel selection code to new dts workaround code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: fix pts handling in the non monotone dts workaround
Michael Niedermayer [Fri, 3 May 2013 13:00:21 +0000 (15:00 +0200)]
ffmpeg: fix pts handling in the non monotone dts workaround

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: fix the used maximum dts in the monotone dts workaround
Michael Niedermayer [Fri, 3 May 2013 12:58:28 +0000 (14:58 +0200)]
ffmpeg: fix the used maximum dts in the monotone dts workaround

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: use a max variable to hold the maximum dts
Michael Niedermayer [Fri, 3 May 2013 12:57:05 +0000 (14:57 +0200)]
ffmpeg: use a max variable to hold the maximum dts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: Check dts before use in non monotone dts workaround
Michael Niedermayer [Fri, 3 May 2013 12:54:13 +0000 (14:54 +0200)]
ffmpeg: Check dts before use in non monotone dts workaround

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: limit non monotone workaround to audio & video streams
Michael Niedermayer [Fri, 3 May 2013 12:53:18 +0000 (14:53 +0200)]
ffmpeg: limit non monotone workaround to audio & video streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: move non monotone prevention code down
Michael Niedermayer [Fri, 3 May 2013 12:52:37 +0000 (14:52 +0200)]
ffmpeg: move non monotone prevention code down

This moves the code to after the bitstream filters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 3 May 2013 12:17:54 +0000 (14:17 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: do not send non-monotonous DTS to the muxers.

Conflicts:
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe'
Michael Niedermayer [Fri, 3 May 2013 11:53:08 +0000 (13:53 +0200)]
Merge commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe'

* commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe':
  avconv: improve -re implementation

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521'
Michael Niedermayer [Fri, 3 May 2013 11:16:34 +0000 (13:16 +0200)]
Merge commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521'

* commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521':
  matroskaenc: add an option to put the index at the start of the file

Conflicts:
doc/muxers.texi
libavformat/matroskaenc.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb'
Michael Niedermayer [Fri, 3 May 2013 11:09:23 +0000 (13:09 +0200)]
Merge commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb'

* commit '0574bc06d23a6690a16c5926dddc9be359a3d7bb':
  matroskaenc: cosmetics, reorder the #includes

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a'
Michael Niedermayer [Fri, 3 May 2013 10:58:52 +0000 (12:58 +0200)]
Merge commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a'

* commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a':
  vc1_parser: Set field_order.
  mpegvideo_parser: Set field_order.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocompat: msvc: Make sure the object files are included when linking statically
Martin Storsjö [Thu, 2 May 2013 08:01:43 +0000 (11:01 +0300)]
compat: msvc: Make sure the object files are included when linking statically

If building libav with -MD in the cflags (for making the MSVC compiler
generate code for using a dynamically linked libc), the system headers
that declare strtod, snprintf and vsnprintf declare the functions as
imported from a DLL. To hook up wrappers of our own for these functions,
the function names are defined to avpriv_*, so that the calling code
within libav calls the wrappers instead. Since these functions
are declared to be imported from DLLs, the calling code expects to
load them from DLL import function pointers (creating references to
_imp__avpriv_strtod instead of directly to avpriv_strtod). If the
libav libraries are not built as DLLs, no such function pointers (as
the calling code expects) are created.

The linker can fix this up automatically in some cases (producing
warnings LNK4217 and LNK4049), if the object files are already
included. By telling the linker to try to include those symbols
(without the _imp prefix as the calling code ends up using),
we get the object files included, so that the linker can do the
automatic fixup. This is done via config.h, so that all (or at least
most) of the object files in our libraries force including the compat
files, to make sure they are included regardless of what files from our
static libraries actually are included.

Signed-off-by: Martin Storsjö <martin@martin.st>