OSDN Git Service

android-x86/external-ffmpeg.git
9 years agoChangelog: Add libpostproc visualization
Michael Niedermayer [Wed, 3 Dec 2014 20:42:03 +0000 (21:42 +0100)]
Changelog: Add libpostproc visualization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf/oggenc: use meaningful error codes
Lukasz Marek [Tue, 2 Dec 2014 23:35:51 +0000 (00:35 +0100)]
lavf/oggenc: use meaningful error codes

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
9 years agoswscale/x86/rgb2rgb_template: fix crash with tiny size and nv12 output
Michael Niedermayer [Wed, 3 Dec 2014 19:21:56 +0000 (20:21 +0100)]
swscale/x86/rgb2rgb_template: fix crash with tiny size and nv12 output

Fixes Ticket4151

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/rmdec: Check codec_data_size
Michael Niedermayer [Wed, 3 Dec 2014 19:01:18 +0000 (20:01 +0100)]
avformat/rmdec: Check codec_data_size

Fixes infinite loop
Fixes Ticket4154

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/aviobuf: Fix infinite loop in ff_get_line()
Michael Niedermayer [Wed, 3 Dec 2014 18:05:56 +0000 (19:05 +0100)]
avformat/aviobuf: Fix infinite loop in ff_get_line()

Fixes ticket4152

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavdevice/decklink_common: fix COM initialization failure check
Jonathan Baecker [Wed, 3 Dec 2014 15:41:41 +0000 (16:41 +0100)]
avdevice/decklink_common: fix COM initialization failure check

Signed-off-by: Jonathan Baecker <jonbae77@gmail.com>
Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/atrac3plusdec: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Wed, 3 Dec 2014 13:46:33 +0000 (14:46 +0100)]
avcodec/atrac3plusdec: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/mpegaudiodec_float: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Wed, 3 Dec 2014 13:43:40 +0000 (14:43 +0100)]
avcodec/mpegaudiodec_float: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/opusdec: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Wed, 3 Dec 2014 13:39:43 +0000 (14:39 +0100)]
avcodec/opusdec: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopngdsp x86: use unaligned access
Christophe Gisquet [Tue, 2 Dec 2014 13:31:49 +0000 (14:31 +0100)]
pngdsp x86: use unaligned access

For test images manually generated to contain only up prediction,
timing results:
         8380x3032    255x185
before:   138635       1992
after:    139232       1996

Actually jumping to the proper version depending on the alignment:
8380x3032: 138767

A 0.5% speed improvement for gigantic images is not worth the code
duplication.

Fixes ticket #4148

Signed-off-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Tested-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: drop usage of coded_frame
Michael Niedermayer [Wed, 3 Dec 2014 02:06:43 +0000 (03:06 +0100)]
ffmpeg: drop usage of coded_frame

It causes all kinds of problems and there is no code in the muxers that reads
this field

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavdevice/decklink_common: fix heap corruption run time error
Jonathan Baecker [Tue, 2 Dec 2014 19:10:41 +0000 (20:10 +0100)]
avdevice/decklink_common: fix heap corruption run time error

Signed-off-by: Jonathan Baecker <jonbae77@gmail.com>
Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoSupport muxing 4k AVC Intra in mov.
Carl Eugen Hoyos [Tue, 2 Dec 2014 22:35:40 +0000 (23:35 +0100)]
Support muxing 4k AVC Intra in mov.

Reported and tested by Rens Dijkshoorn, rens onlinemedia nl

9 years agoMerge commit '2e0935965b824bc641b7e0bafafcbb1e36027f79'
Michael Niedermayer [Tue, 2 Dec 2014 21:55:14 +0000 (22:55 +0100)]
Merge commit '2e0935965b824bc641b7e0bafafcbb1e36027f79'

* commit '2e0935965b824bc641b7e0bafafcbb1e36027f79':
  Drop the unofficial extension prefix for MPEG and MPEG-TS formats

See: fdcb2873e1c898cf26216f7e80d95d03387ba55b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee'
Michael Niedermayer [Tue, 2 Dec 2014 21:53:22 +0000 (22:53 +0100)]
Merge commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee'

* commit '7319a47c7e7931ebf8f475cc2cffc7bcd333acee':
  mpegtsenc: recognize .mts as MPEG Transport Stream

Conflicts:
libavformat/mpegtsenc.c

See: e2baaa21aabc7edb3c2275eac39ed1d40884b25a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '8f8caca2242e1fe05f37493cfabcd3f4de198550'
Michael Niedermayer [Tue, 2 Dec 2014 21:39:01 +0000 (22:39 +0100)]
Merge commit '8f8caca2242e1fe05f37493cfabcd3f4de198550'

* commit '8f8caca2242e1fe05f37493cfabcd3f4de198550':
  Add support for BDAV/m2ts-mode muxing

Conflicts:
libavformat/mpegtsenc.c

See: 09a858da7d5535e78e9cf942a468aec411ffbf19
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '26e20dfd06ac62da596a9549867f990f1200a04e'
Michael Niedermayer [Tue, 2 Dec 2014 21:34:06 +0000 (22:34 +0100)]
Merge commit '26e20dfd06ac62da596a9549867f990f1200a04e'

* commit '26e20dfd06ac62da596a9549867f990f1200a04e':
  options_table: fix colorspace minimum option value

See: 8c28a39c2c38fd9d13dc5247fca7bca8b3f2fcad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09'
Michael Niedermayer [Tue, 2 Dec 2014 21:26:40 +0000 (22:26 +0100)]
Merge commit '3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09'

* commit '3cec81f4d4f26b62bc2d22bb450bbf51ec3a7f09':
  mov: allocate the tag value dynamically

Conflicts:
libavformat/mov.c

See: f31445a82d6acd0b8fab5a26c04e91645f4854d8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'e352b293712ff7cbde67eba3ce3f8510b037de09'
Michael Niedermayer [Tue, 2 Dec 2014 21:00:02 +0000 (22:00 +0100)]
Merge commit 'e352b293712ff7cbde67eba3ce3f8510b037de09'

* commit 'e352b293712ff7cbde67eba3ce3f8510b037de09':
  mov: Add an option for exporting all metadata

Conflicts:
libavformat/isom.h
libavformat/mov.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffserver_config: print warning when using default value
Lukasz Marek [Wed, 26 Nov 2014 18:41:24 +0000 (19:41 +0100)]
ffserver_config: print warning when using default value

Some of the defaults may be harmful (like buffer size).
It is good user is aware of that.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
9 years agoffserver_config: set defaults basing on absence of set value
Lukasz Marek [Wed, 26 Nov 2014 18:08:18 +0000 (19:08 +0100)]
ffserver_config: set defaults basing on absence of set value

This prevents the situation when user set option to 0 and ffserver
threats it as not set value, so applies the default.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
9 years agoffserver_config: remove useless defaults
Lukasz Marek [Wed, 26 Nov 2014 17:54:16 +0000 (18:54 +0100)]
ffserver_config: remove useless defaults

Options are already set to its defaults by AVOption API.
The only difference is for qmin, new default is 2, ffserver set to 3.
It is dead code because if condition is not meet unless user set option to 0.
Meeting condition would mean that ffserver overwrites explicity set option.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
9 years agoffserver: use avcodec_copy_context to copy context
Lukasz Marek [Sat, 22 Nov 2014 01:33:29 +0000 (02:33 +0100)]
ffserver: use avcodec_copy_context to copy context

Copying context using dedicated function is safer that raw memcpy
which creates shallow copy.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
9 years agoMerge commit '5639ed9abb58311f82cf3499b682d228290adb09'
Michael Niedermayer [Tue, 2 Dec 2014 20:45:44 +0000 (21:45 +0100)]
Merge commit '5639ed9abb58311f82cf3499b682d228290adb09'

* commit '5639ed9abb58311f82cf3499b682d228290adb09':
  mov: do not truncate the language-prefixed tag

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3'
Michael Niedermayer [Tue, 2 Dec 2014 20:39:05 +0000 (21:39 +0100)]
Merge commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3'

* commit '604c9b1196c70d79bbbc1f23e75f6a8253a74da3':
  rtsp: move the CONFIG_ macros to the beginning of the check

Conflicts:
libavformat/rtsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a'
Michael Niedermayer [Tue, 2 Dec 2014 20:29:48 +0000 (21:29 +0100)]
Merge commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a'

* commit '7464e98f74c03d3efa0cdc8d7abad06e4c3c277a':
  aac: Simplify decode_mid_side_stereo

Conflicts:
libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Tue, 2 Dec 2014 18:48:01 +0000 (19:48 +0100)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  configure: add a note about pkg-config --static.
  configure: add optional pkg-config helper and use it.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/aacdec: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Tue, 2 Dec 2014 18:16:02 +0000 (19:16 +0100)]
avcodec/aacdec: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRevert "avfilter/vf_interlace: more accurate pts calculation"
Michael Niedermayer [Tue, 2 Dec 2014 17:48:03 +0000 (18:48 +0100)]
Revert "avfilter/vf_interlace: more accurate pts calculation"

This reverts commit df8248f66e362c3015d95ac86d1917dde8dc0a0c.

the revert produces a timebase and timestamps that are more close
to what users expect

Hoped-by: koda
9 years agoconfigure: add a note about pkg-config --static.
Nicolas George [Tue, 2 Dec 2014 12:54:46 +0000 (13:54 +0100)]
configure: add a note about pkg-config --static.

Try to detect "$cc -static" without "pkg-config --static".
Also, when a library detection using pkg-config fails,
make it explicit this was pkg-config.

9 years agoconfigure: add optional pkg-config helper and use it.
Nicolas George [Tue, 2 Dec 2014 12:29:47 +0000 (13:29 +0100)]
configure: add optional pkg-config helper and use it.

The require variant dies if the package is not present.
The check variant does not import the flags to the used list.
The new variant imports the flags if the package is present
but does not die if it is not.
The new call graph is: require -> use -> check.

Use use_pkg_config for libx264 and libsmbclient: more readable
and three external call less per library.

9 years agoavfilter/vf_tinterlace: Favor using standard timebases for the output
Michael Niedermayer [Mon, 1 Dec 2014 19:52:10 +0000 (20:52 +0100)]
avfilter/vf_tinterlace: Favor using standard timebases for the output

Reported-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Inspired by discussion with Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/ppc/lossless_audiodsp_altivec: POWER LE support for scalarproduct_and_madd_in...
Rong Yan [Tue, 2 Dec 2014 07:37:11 +0000 (07:37 +0000)]
avcodec/ppc/lossless_audiodsp_altivec: POWER LE support for scalarproduct_and_madd_int16_altivec()

adds macro GET_T()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoDrop the unofficial extension prefix for MPEG and MPEG-TS formats
Florent Le Coz [Sat, 29 Nov 2014 16:53:47 +0000 (17:53 +0100)]
Drop the unofficial extension prefix for MPEG and MPEG-TS formats

As per the RFCs:
http://tools.ietf.org/html/rfc3555#page-38
http://tools.ietf.org/html/rfc3003

CC: libav-stable@libav.org
9 years agompegtsenc: recognize .mts as MPEG Transport Stream
Jean-Baptiste Mardelle [Sat, 29 Nov 2014 16:53:46 +0000 (17:53 +0100)]
mpegtsenc: recognize .mts as MPEG Transport Stream

9 years agoAdd support for BDAV/m2ts-mode muxing
Fredrik Axelsson [Sat, 29 Nov 2014 16:53:45 +0000 (17:53 +0100)]
Add support for BDAV/m2ts-mode muxing

Signed-off-by: Fredrik Axelsson <fraxbe@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agooptions_table: fix colorspace minimum option value
Jon Morley [Mon, 10 Nov 2014 18:43:42 +0000 (10:43 -0800)]
options_table: fix colorspace minimum option value

The min value for colorspace should be zero and not one since the first
valid index into the frame colorspace array is AVCOL_SPC_RGB which is 0.

9 years agomov: allocate the tag value dynamically
Thilo Borgmann [Sat, 29 Nov 2014 16:51:14 +0000 (17:51 +0100)]
mov: allocate the tag value dynamically

This allows to load metadata entries longer than 1024 bytes.
Displaying them is still limited to 1024 characters, but applications
can load them fully now.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
9 years agomov: Add an option for exporting all metadata
Vittorio Giovara [Sat, 29 Nov 2014 16:51:13 +0000 (17:51 +0100)]
mov: Add an option for exporting all metadata

9 years agomov: do not truncate the language-prefixed tag
Vittorio Giovara [Sat, 29 Nov 2014 16:51:12 +0000 (17:51 +0100)]
mov: do not truncate the language-prefixed tag

9 years agortsp: move the CONFIG_ macros to the beginning of the check
Vittorio Giovara [Sat, 29 Nov 2014 16:39:41 +0000 (17:39 +0100)]
rtsp: move the CONFIG_ macros to the beginning of the check

With --disable-optimizations, the DCE of some compilers does not remove
such unused code, causing linking failure.

9 years agoaac: Simplify decode_mid_side_stereo
Luca Barbato [Fri, 21 Nov 2014 12:57:36 +0000 (12:57 +0000)]
aac: Simplify decode_mid_side_stereo

Might spare few cycles if the compiler is naive and
makes the function more readable.

9 years agoavformat/apngdec: exit probing when skipping is not possible.
Benoit Fouet [Tue, 2 Dec 2014 10:24:21 +0000 (11:24 +0100)]
avformat/apngdec: exit probing when skipping is not possible.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoapng: move shared header from avformat to avcodec.
Benoit Fouet [Tue, 2 Dec 2014 08:21:47 +0000 (09:21 +0100)]
apng: move shared header from avformat to avcodec.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf/qcp: Print unknown GUID on error.
Carl Eugen Hoyos [Tue, 2 Dec 2014 10:40:01 +0000 (11:40 +0100)]
lavf/qcp: Print unknown GUID on error.

9 years agoAlso print GUIDs as shown in the Windows registry to ease debugging.
Carl Eugen Hoyos [Tue, 2 Dec 2014 10:39:06 +0000 (11:39 +0100)]
Also print GUIDs as shown in the Windows registry to ease debugging.

9 years agolavc/dirac_arith: Only compile x86 asm if ARCH_X86 is set.
Carl Eugen Hoyos [Tue, 2 Dec 2014 10:36:48 +0000 (11:36 +0100)]
lavc/dirac_arith: Only compile x86 asm if ARCH_X86 is set.

Fixes ticket #3544.

9 years agotests: Add vsynth2 which uses the new reference.pnm
Michael Niedermayer [Sun, 30 Nov 2014 18:28:42 +0000 (19:28 +0100)]
tests: Add vsynth2 which uses the new reference.pnm

The file is already present in git and by using it we can perform more tests
without the need of fate samples

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agotests: Rename vsynth2 to vsynth_lena
Michael Niedermayer [Sun, 30 Nov 2014 18:47:45 +0000 (19:47 +0100)]
tests: Rename vsynth2 to vsynth_lena

This avoids confusion with a growing number of vsynth tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/crypto: Use av_memdup()
Michael Niedermayer [Tue, 2 Dec 2014 00:47:49 +0000 (01:47 +0100)]
avformat/crypto: Use av_memdup()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/crypto: added encryption
Christian Suloway [Mon, 1 Dec 2014 18:55:28 +0000 (12:55 -0600)]
avformat/crypto: added encryption

Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc: mention the noise_bsf parameter in the docs
Christophe Gisquet [Sun, 30 Nov 2014 10:59:22 +0000 (11:59 +0100)]
doc: mention the noise_bsf parameter in the docs

This looks more like a seed than an amount, as the variable name
could lead to think.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'e4a77dc204f80a6876cbd91de9b71c30feebe119'
Michael Niedermayer [Mon, 1 Dec 2014 20:33:07 +0000 (21:33 +0100)]
Merge commit 'e4a77dc204f80a6876cbd91de9b71c30feebe119'

* commit 'e4a77dc204f80a6876cbd91de9b71c30feebe119':
  Make the RELEASE file match with the most recent tag

Conflicts:
RELEASE

Not merged as the tag is not a FFmpeg version

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/vorbisdec: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Mon, 1 Dec 2014 17:10:11 +0000 (18:10 +0100)]
avcodec/vorbisdec: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/opus_celt: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Mon, 1 Dec 2014 17:12:38 +0000 (18:12 +0100)]
avcodec/opus_celt: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/wmaprodec: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Mon, 1 Dec 2014 17:07:59 +0000 (18:07 +0100)]
avcodec/wmaprodec: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/utils: Search harder for missing stream information in flv by default
Michael Niedermayer [Mon, 1 Dec 2014 14:26:58 +0000 (15:26 +0100)]
avformat/utils: Search harder for missing stream information in flv by default

Fixes Ticket4133

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMake the RELEASE file match with the most recent tag
Reinhard Tartler [Mon, 1 Dec 2014 03:31:31 +0000 (22:31 -0500)]
Make the RELEASE file match with the most recent tag

9 years agoavcodec/motion_est: use 2x8x8 for interlaced qpel
Michael Niedermayer [Mon, 1 Dec 2014 12:23:24 +0000 (13:23 +0100)]
avcodec/motion_est: use 2x8x8 for interlaced qpel

Fixes out of array read
Fixes Ticket4121

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc: correct license template for t2h.pm
Andreas Cadhalpun [Sun, 30 Nov 2014 22:47:36 +0000 (23:47 +0100)]
doc: correct license template for t2h.pm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc: fix spelling errors
Andreas Cadhalpun [Sun, 30 Nov 2014 22:59:22 +0000 (23:59 +0100)]
doc: fix spelling errors

succesfully => successfully, reproducable => reproducible, specifiying => specifying, isnt => isn't, seperated => separated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/mxfdec: Reset structural_components_count when allocation fails
Michael Niedermayer [Sun, 30 Nov 2014 22:25:19 +0000 (23:25 +0100)]
avformat/mxfdec: Reset structural_components_count when allocation fails

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavformat/mxfdec.c: initial support for EssenceGroups
Mark Reid [Sun, 30 Nov 2014 20:16:27 +0000 (12:16 -0800)]
libavformat/mxfdec.c: initial support for EssenceGroups

Previous version reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoLICENSE.md: Add tests/reference.pnm
Michael Niedermayer [Sun, 30 Nov 2014 18:09:45 +0000 (19:09 +0100)]
LICENSE.md: Add tests/reference.pnm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '8895bf7b78650c0c21c88cec0484e138ec511a4b'
Michael Niedermayer [Sun, 30 Nov 2014 17:38:22 +0000 (18:38 +0100)]
Merge commit '8895bf7b78650c0c21c88cec0484e138ec511a4b'

* commit '8895bf7b78650c0c21c88cec0484e138ec511a4b':
  Replace lena.pnm

Conflicts:
tests/Makefile
tests/ref/seek/vsynth2-asv1
tests/ref/seek/vsynth2-asv2
tests/ref/seek/vsynth2-ffv1
tests/ref/seek/vsynth2-flashsv
tests/ref/seek/vsynth2-flv
tests/ref/seek/vsynth2-h261
tests/ref/seek/vsynth2-h263
tests/ref/seek/vsynth2-h263p
tests/ref/seek/vsynth2-huffyuv
tests/ref/seek/vsynth2-ljpeg
tests/ref/seek/vsynth2-mjpeg
tests/ref/seek/vsynth2-mpeg1
tests/ref/seek/vsynth2-mpeg1b
tests/ref/seek/vsynth2-mpeg2-422
tests/ref/seek/vsynth2-mpeg2-idct-int
tests/ref/seek/vsynth2-mpeg2-ilace
tests/ref/seek/vsynth2-mpeg2-ivlc-qprd
tests/ref/seek/vsynth2-mpeg2-thread
tests/ref/seek/vsynth2-mpeg2-thread-ivlc
tests/ref/seek/vsynth2-mpeg4
tests/ref/seek/vsynth2-mpeg4-adap
tests/ref/seek/vsynth2-mpeg4-error
tests/ref/seek/vsynth2-mpeg4-nr
tests/ref/seek/vsynth2-mpeg4-qpel
tests/ref/seek/vsynth2-mpeg4-qprd
tests/ref/seek/vsynth2-mpeg4-rc
tests/ref/seek/vsynth2-mpeg4-thread
tests/ref/seek/vsynth2-msmpeg4
tests/ref/seek/vsynth2-msmpeg4v2
tests/ref/seek/vsynth2-roqvideo
tests/ref/seek/vsynth2-rv10
tests/ref/seek/vsynth2-rv20
tests/ref/seek/vsynth2-svq1
tests/ref/seek/vsynth2-wmv1
tests/ref/seek/vsynth2-wmv2
tests/ref/vsynth/vsynth2-asv1
tests/ref/vsynth/vsynth2-asv2
tests/ref/vsynth/vsynth2-cljr
tests/ref/vsynth/vsynth2-dnxhd-1080i
tests/ref/vsynth/vsynth2-dnxhd-720p
tests/ref/vsynth/vsynth2-dnxhd-720p-10bit
tests/ref/vsynth/vsynth2-dnxhd-720p-rd
tests/ref/vsynth/vsynth2-dv
tests/ref/vsynth/vsynth2-dv-411
tests/ref/vsynth/vsynth2-dv-50
tests/ref/vsynth/vsynth2-ffv1
tests/ref/vsynth/vsynth2-ffvhuff
tests/ref/vsynth/vsynth2-flashsv
tests/ref/vsynth/vsynth2-flv
tests/ref/vsynth/vsynth2-h261
tests/ref/vsynth/vsynth2-h263
tests/ref/vsynth/vsynth2-h263-obmc
tests/ref/vsynth/vsynth2-h263p
tests/ref/vsynth/vsynth2-huffyuv
tests/ref/vsynth/vsynth2-jpegls
tests/ref/vsynth/vsynth2-ljpeg
tests/ref/vsynth/vsynth2-mjpeg
tests/ref/vsynth/vsynth2-mpeg1
tests/ref/vsynth/vsynth2-mpeg1b
tests/ref/vsynth/vsynth2-mpeg2
tests/ref/vsynth/vsynth2-mpeg2-422
tests/ref/vsynth/vsynth2-mpeg2-idct-int
tests/ref/vsynth/vsynth2-mpeg2-ilace
tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd
tests/ref/vsynth/vsynth2-mpeg2-thread
tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc
tests/ref/vsynth/vsynth2-mpeg4
tests/ref/vsynth/vsynth2-mpeg4-adap
tests/ref/vsynth/vsynth2-mpeg4-adv
tests/ref/vsynth/vsynth2-mpeg4-error
tests/ref/vsynth/vsynth2-mpeg4-nr
tests/ref/vsynth/vsynth2-mpeg4-qpel
tests/ref/vsynth/vsynth2-mpeg4-qprd
tests/ref/vsynth/vsynth2-mpeg4-rc
tests/ref/vsynth/vsynth2-mpeg4-thread
tests/ref/vsynth/vsynth2-msmpeg4
tests/ref/vsynth/vsynth2-msmpeg4v2
tests/ref/vsynth/vsynth2-prores
tests/ref/vsynth/vsynth2-qtrle
tests/ref/vsynth/vsynth2-rgb
tests/ref/vsynth/vsynth2-roqvideo
tests/ref/vsynth/vsynth2-rv10
tests/ref/vsynth/vsynth2-rv20
tests/ref/vsynth/vsynth2-svq1
tests/ref/vsynth/vsynth2-v210
tests/ref/vsynth/vsynth2-wmv1
tests/ref/vsynth/vsynth2-wmv2
tests/ref/vsynth/vsynth2-yuv

See: c4abee734dcbdb589925dd6da98041dcf663ce49
Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '0f257e29c5520b215e573e7e3abde8e5a4743309'
Michael Niedermayer [Sun, 30 Nov 2014 17:17:51 +0000 (18:17 +0100)]
Merge commit '0f257e29c5520b215e573e7e3abde8e5a4743309'

* commit '0f257e29c5520b215e573e7e3abde8e5a4743309':
  Treat all '*.pnm' files as non-text file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: take bsf arguments from the command line
Christophe Gisquet [Sat, 29 Nov 2014 18:15:02 +0000 (19:15 +0100)]
ffmpeg: take bsf arguments from the command line

The format is now:
-bsf:X filter1[=opt1=str1/opt2=str2],filter2
ie the parameters are appended after the filter name using '='. As ','
has been reserved already for the list of filters, '/' is just an
example of token separation for now, but that could become part of the
API to avoid each bsf using its own tokenization.

The proper solution would be using AVOption, but this is overkill for now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/adxenc: fix rounding
Michael Niedermayer [Sun, 30 Nov 2014 11:56:02 +0000 (12:56 +0100)]
avcodec/adxenc: fix rounding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/adxenc: match prediction used in the decoder
Michael Niedermayer [Sun, 30 Nov 2014 11:40:03 +0000 (12:40 +0100)]
avcodec/adxenc: match prediction used in the decoder

The prediction used in the encoder was not correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/atrac3: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Sun, 30 Nov 2014 10:23:34 +0000 (11:23 +0100)]
avcodec/atrac3: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/libmp3lame: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Sun, 30 Nov 2014 10:21:50 +0000 (11:21 +0100)]
avcodec/libmp3lame: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/wma: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Sun, 30 Nov 2014 10:19:29 +0000 (11:19 +0100)]
avcodec/wma: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoh264_ps: move and export aspect_ratio
Christophe Gisquet [Sun, 30 Nov 2014 00:45:52 +0000 (00:45 +0000)]
h264_ps: move and export aspect_ratio

Needed for filters that may need it, like an SPS bsf.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/riffdec: ask for samples with wav header size < 14
Michael Niedermayer [Sun, 30 Nov 2014 00:52:04 +0000 (01:52 +0100)]
avformat/riffdec: ask for samples with wav header size < 14

Based on commit by Hendrik Leppkes <h.leppkes@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavfilter/vf_yadif: fix extra leading dup frame when deint=1
Neil Birkbeck [Sat, 29 Nov 2014 20:23:58 +0000 (12:23 -0800)]
avfilter/vf_yadif: fix extra leading dup frame when deint=1

Logic for handling single frame in yadif (0f9f24c9), caused deint=1 (e.g., yadif=0:-1:1) to output extra duplicate leading frame:

ffmpeg -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm  -vf yadif=0:-1:1,showinfo -f null -y /dev/null
 [Parsed_showinfo_1 @ 0x1d967d0] n:0 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:E457EEA0 plane_checksum:[E457EEA0] mean:[126] stdev:[46.6]
 [Parsed_showinfo_1 @ 0x1d967d0] n:1 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:E457EEA0 plane_checksum:[E457EEA0] mean:[126] stdev:[46.6]
(Outputs 51 frames)

After patch, vf "yadif=0:-1:1" behaves correctly (like "yadif=0:-1:0") and outputs 50 frames, first two:

[Parsed_showinfo_1 @ 0x1e307d0] n:0 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:68E8D1EB plane_checksum:[68E8D1EB] mean:[126] stdev:[46.0]
[Parsed_showinfo_1 @ 0x1e307d0] n:1 pts:2 pts_time:0.04 pos:-1 fmt:gray sar:0/1 s:352x432 i:P iskey:1 type:I checksum:4E674BC7 plane_checksum:[4E674BC7] mean:[125] stdev:[46.0]
(Outputs 50 frames)

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/twinvq: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Sat, 29 Nov 2014 18:22:54 +0000 (19:22 +0100)]
avcodec/twinvq: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/ra288: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Sat, 29 Nov 2014 18:22:32 +0000 (19:22 +0100)]
avcodec/ra288: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/on2avc: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Sat, 29 Nov 2014 18:02:19 +0000 (19:02 +0100)]
avcodec/on2avc: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/aacenc: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Sat, 29 Nov 2014 17:58:13 +0000 (18:58 +0100)]
avcodec/aacenc: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/ac3enc: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Sat, 29 Nov 2014 17:54:27 +0000 (18:54 +0100)]
avcodec/ac3enc: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil/ppc/util_altivec: add () to VEC_SPLAT16 macro
Michael Niedermayer [Sat, 29 Nov 2014 12:40:33 +0000 (13:40 +0100)]
avutil/ppc/util_altivec: add () to VEC_SPLAT16 macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil/buffer: Move USE_ATOMICS to thread.h to avoid it becoming out of sync with it
Michael Niedermayer [Sat, 29 Nov 2014 11:06:03 +0000 (12:06 +0100)]
avutil/buffer: Move USE_ATOMICS to thread.h to avoid it becoming out of sync with it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavutil/threads.h: correct an include to be local
Dave Yeo [Sat, 29 Nov 2014 07:36:06 +0000 (23:36 -0800)]
libavutil/threads.h: correct an include to be local

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavutil/thread.h: Support OS/2 threads
Dave Yeo [Sat, 29 Nov 2014 07:34:20 +0000 (23:34 -0800)]
libavutil/thread.h: Support OS/2 threads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil/bprint: C++ compatible AVBPrint definition.
Vadim Kalinsky [Mon, 24 Nov 2014 15:38:05 +0000 (10:38 -0500)]
avutil/bprint: C++ compatible AVBPrint definition.

Previous version reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavu/opt: add escaping to av_opt_serialize
Lukasz Marek [Tue, 25 Nov 2014 19:25:10 +0000 (20:25 +0100)]
lavu/opt: add escaping to av_opt_serialize

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
9 years agoReplace lena.pnm
Reinhard Tartler [Thu, 27 Nov 2014 17:21:03 +0000 (18:21 +0100)]
Replace lena.pnm

The new reference.pnm is a freely licensed replacement. The photo has
been taken by Reinhard Tartler on August 28 2014, and is licensed under
the expat license as stated at http://www.jclark.com/xml/copying.txt

9 years agoTreat all '*.pnm' files as non-text file
Reinhard Tartler [Fri, 28 Nov 2014 14:52:50 +0000 (09:52 -0500)]
Treat all '*.pnm' files as non-text file

This convinces the pre-receive hook to not consider all *.pnm files as
text files to reduce the patch sizes and avoids triggering whitespace
checks,

Contains a correction by Janne Grunau <janne-libav@jannau.net>

9 years agoavfilter/vf_idet: Fixing idet for single-frame inputs.
Neil Birkbeck [Fri, 28 Nov 2014 21:41:02 +0000 (13:41 -0800)]
avfilter/vf_idet: Fixing idet for single-frame inputs.

Handle single frame inputs similar to yadif (e.g., https://github.com/FFmpeg/FFmpeg/commit/0f9f24c9cfd291c7ece4d3bad64fdf06d107168a and https://github.com/FFmpeg/FFmpeg/commit/681e008d06d2241d50abe6316c908a184ddc5942)

Example:
  ffmpeg -r 1 -t 1 -i fate-suite/ffmpeg-synthetic/vsynth1/%02d.pgm  -vf idet,showinfo -f null -y /dev/null

Previously:
  Output file is empty, nothing was encoded (check -ss / -t / -frames parameters if used)
  [Parsed_idet_0 @ 0x36389d0] Repeated Fields: Neither:     0 Top:     0 Bottom:     0

After patch:
  [Parsed_showinfo_1 @ 0x1909810] n:0 pts:0 pts_time:0 pos:-1 fmt:gray sar:0/1 s:352x432 ...
  [Parsed_idet_0 @ 0x18f9bb0] Repeated Fields: Neither:     1 Top:     0 Bottom:     0

Fate looks good.

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '491805636cef50d3f582bd345e1460eeb739ea48'
Michael Niedermayer [Fri, 28 Nov 2014 21:01:38 +0000 (22:01 +0100)]
Merge commit '491805636cef50d3f582bd345e1460eeb739ea48'

* commit '491805636cef50d3f582bd345e1460eeb739ea48':
  rtmpproto: Fix a typo in a comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofix Makefile objects for pulseaudio support
Michael Stypa [Fri, 28 Nov 2014 14:54:50 +0000 (15:54 +0100)]
fix Makefile objects for pulseaudio support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agortmpproto: Fix a typo in a comment
Martin Storsjö [Fri, 28 Nov 2014 17:39:38 +0000 (19:39 +0200)]
rtmpproto: Fix a typo in a comment

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoavcodec/pngdec: apng: fix output buffer filling when no blending is needed.
Benoit Fouet [Fri, 28 Nov 2014 15:54:09 +0000 (16:54 +0100)]
avcodec/pngdec: apng: fix output buffer filling when no blending is needed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/ppc/h264qpel_template: protect unistd.h by #if HAVE_UNISTD_H
Michael Niedermayer [Fri, 28 Nov 2014 15:11:02 +0000 (16:11 +0100)]
avcodec/ppc/h264qpel_template: protect unistd.h by #if HAVE_UNISTD_H

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/pngdec: allow for some code path optimizations.
Benoit Fouet [Fri, 28 Nov 2014 13:03:08 +0000 (14:03 +0100)]
avcodec/pngdec: allow for some code path optimizations.

Use 'if (CONFIG_APNG_DECODER)' where needed, so that the compiler can
optimize out some portion of code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/pngdec: do not blend on transparent black
Benoit Fouet [Fri, 28 Nov 2014 09:43:01 +0000 (10:43 +0100)]
avcodec/pngdec: do not blend on transparent black

There is no need to memset the zlib output buffer, as there is no
blending happening there. Instead, do not blend when the dispose
operation is set to 'background' (tranparent black).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/ppc/h264qpel: POWER LE support for put_pixels16_l2_altivec() and avg_pixels16...
Rong Yan [Fri, 28 Nov 2014 06:53:35 +0000 (06:53 +0000)]
avcodec/ppc/h264qpel: POWER LE support for put_pixels16_l2_altivec() and avg_pixels16_l2_altivec()

add put_unligned_store() and avg_unligned_store() macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/ppc/h264qpel_template: POWER LE support for PREFIX_h264_qpel16_h_lowpass_alti...
Rong Yan [Fri, 28 Nov 2014 06:52:24 +0000 (06:52 +0000)]
avcodec/ppc/h264qpel_template: POWER LE support for PREFIX_h264_qpel16_h_lowpass_altivec() PREFIX_h264_qpel16_v_lowpass_altivec() PREFIX_h264_qpel16_hv_lowpass_altivec()

add load_alignment() macro

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/ppc/h264chroma_template: POWER LE support for PREFIX_h264_chroma_mc8_altivec...
Rong Yan [Fri, 28 Nov 2014 06:50:49 +0000 (06:50 +0000)]
avcodec/ppc/h264chroma_template: POWER LE support for PREFIX_h264_chroma_mc8_altivec() PREFIX_no_rnd_vc1_chroma_mc8_altivec() CHROMA_MC8_ALTIVEC_CORE_SIMPLE() CHROMA_MC8_ALTIVEC_CORE()

add marcos GET_VSRC1() GET_VSRC()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/ppc/h264dsp: POWER LE support for h264_idct8_add_altivec() h264_idct_dc_add_i...
Rong Yan [Fri, 28 Nov 2014 06:49:50 +0000 (06:49 +0000)]
avcodec/ppc/h264dsp: POWER LE support for h264_idct8_add_altivec() h264_idct_dc_add_internal() h264_loop_filter_luma_altivec() write16x4() VEC_1D_DCT() weight_h264_W_altivec() biweight_h264_W_altivec() VEC_LOAD_U8_ADD_S16_STORE_U8() ALTIVEC_STORE_SUM_CLIP()

add marcos GET_2PERM() dstv_load() vdst_load() dest_unligned_store()

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