ffmpeg.git
6 years agohevcdsp: remove an unneeded variable in the loop filter
Anton Khirnov [Sat, 19 Jul 2014 12:50:11 +0000 (14:50 +0200)]
hevcdsp: remove an unneeded variable in the loop filter
beta0 and beta1 will always be the same within a CU

Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>
cherry picked from commit 4a23d824741a289c7d2d2f2871d1e2621b63fa1b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/hevc_deblock: cosmetics
Anton Khirnov [Sat, 19 Jul 2014 12:18:03 +0000 (14:18 +0200)]
avcodec/x86/hevc_deblock: cosmetics

cherry picked from commit f7843356253459e6010320292dbbc1e888a5249b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: cleanups in SSE2 and SSSE3 loop filters, use fewer instructions
Anton Khirnov [Sat, 19 Jul 2014 12:18:03 +0000 (14:18 +0200)]
hevc: cleanups in SSE2 and SSSE3 loop filters, use fewer instructions

cherry picked from commit f7843356253459e6010320292dbbc1e888a5249b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/hevc_deblock: use test instead of cmp 0
Anton Khirnov [Sat, 19 Jul 2014 12:18:03 +0000 (14:18 +0200)]
avcodec/x86/hevc_deblock: use test instead of cmp 0

cherry picked from commit f7843356253459e6010320292dbbc1e888a5249b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/hevc_deblock: use of paddw instead of psllw
Anton Khirnov [Sat, 19 Jul 2014 12:18:03 +0000 (14:18 +0200)]
avcodec/x86/hevc_deblock: use of paddw instead of psllw

cherry picked from commit f7843356253459e6010320292dbbc1e888a5249b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/hevc_deblock: add %ifs to avoid "do nothing instructions"
Anton Khirnov [Sat, 19 Jul 2014 12:18:03 +0000 (14:18 +0200)]
avcodec/x86/hevc_deblock: add %ifs to avoid "do nothing instructions"

cherry picked from commit f7843356253459e6010320292dbbc1e888a5249b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: cleaning up SSE2 and SSSE3 deblocking filters
Anton Khirnov [Sat, 19 Jul 2014 11:53:56 +0000 (13:53 +0200)]
hevc: cleaning up SSE2 and SSSE3 deblocking filters

Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>
cherry picked from commit b432041d7d1eca38831590f13b4e5baffff8186f
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc/mvs: cosmetics
Mickaël Raulet [Fri, 18 Jul 2014 23:39:09 +0000 (01:39 +0200)]
hevc/mvs: cosmetics

cherry picked from commit 9053cd92700e939cde49ab0ea3c6917be453cab7

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc/mvs: more cleanups
Mickaël Raulet [Fri, 18 Jul 2014 23:38:06 +0000 (01:38 +0200)]
hevc/mvs: more cleanups

cherry picked from commit c4e467e79f59453783c97bc6044082edb7a6468b

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc/mvs: code cleaning
Mickaël Raulet [Fri, 18 Jul 2014 23:23:36 +0000 (01:23 +0200)]
hevc/mvs: code cleaning

cherry picked from commit 74f10da013ea71a3f6b77cdff989c4574c8a5ea2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc/mvs: simplifying derive_spatial_merge_candidates function
Mickaël Raulet [Fri, 18 Jul 2014 23:12:24 +0000 (01:12 +0200)]
hevc/mvs: simplifying derive_spatial_merge_candidates function

cherry picked from commit 99be11cf08a5628d0bb6ac7f4958bf9dd35cda62

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc/mvs: remove same prediction block
Mickaël Raulet [Fri, 18 Jul 2014 23:03:20 +0000 (01:03 +0200)]
hevc/mvs: remove same prediction block

cherry picked from commit 1206262ba1ef810328cadce99d5cdc0bf9285e4d

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc/mvs: simplify derive_temporal_colocated_mvs
Mickaël Raulet [Fri, 18 Jul 2014 22:51:42 +0000 (00:51 +0200)]
hevc/mvs: simplify derive_temporal_colocated_mvs

cherry picked from commit def7db60966765f4687250d766b40dbcf0f7e503

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate/hevc: update with new Rext bitstreams
Mickaël Raulet [Tue, 22 Jul 2014 10:09:34 +0000 (12:09 +0200)]
fate/hevc: update with new Rext bitstreams

cherry picked from commit d0924959f16d42630cfd7b3b4fce9fead60a4aa8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc/rext: remove warning for cross component prediction
Mickaël Raulet [Tue, 22 Jul 2014 08:18:31 +0000 (10:18 +0200)]
hevc/rext: remove warning for cross component prediction

cherry picked from commit fb595102593c94179502bb1967f978a1d99cc7cb

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/segment: sanitize segment end time in case last packet do not have a defined...
Stefano Sabatini [Thu, 17 Jul 2014 18:37:55 +0000 (20:37 +0200)]
lavf/segment: sanitize segment end time in case last packet do not have a defined duration

In particular, avoids to set segments with duration set to 0
(e.g. segment with a single reference frame for which duration is
undefined).

6 years agolavf/segment: do not allow to create segments with no key-frames
Stefano Sabatini [Thu, 17 Jul 2014 18:28:40 +0000 (20:28 +0200)]
lavf/segment: do not allow to create segments with no key-frames

Fix trac ticket #3749.

6 years agohevc/rext: fixing rdpcm and scaling list for Range Extension
Mickaël Raulet [Tue, 22 Jul 2014 08:14:12 +0000 (10:14 +0200)]
hevc/rext: fixing rdpcm and scaling list for Range Extension

-new rext bitstreams:
PERSIST_RPARAM_A_RExt_Sony_1.bit           ok    =
QMATRIX_A_RExt_Sony_1.bit                  ok    =
SAO_A_RExt_MediaTek_1.bit                  ok    =

(cherry picked from commit cdea029d452c521f8e5bcbe589f44b13a4011604)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc/rext: update boundary strength for chroma deblocking filter
Mickaël Raulet [Tue, 22 Jul 2014 10:04:48 +0000 (12:04 +0200)]
hevc/rext: update boundary strength for chroma deblocking filter

cherry picked from commit 7d05c95ac5a63d7675bf645e74b4cf1fffff4796

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '78670fbf07bd03479073d4218440de4914304680'
Michael Niedermayer [Tue, 22 Jul 2014 10:54:56 +0000 (12:54 +0200)]
Merge commit '78670fbf07bd03479073d4218440de4914304680'

* commit '78670fbf07bd03479073d4218440de4914304680':
  imgconvert: cosmetics: Reshuffle defines to reduce ifdeffery

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6869612f5c7d4d2f20f69a5658328a761deadb1c'
Michael Niedermayer [Tue, 22 Jul 2014 10:46:13 +0000 (12:46 +0200)]
Merge commit '6869612f5c7d4d2f20f69a5658328a761deadb1c'

* commit '6869612f5c7d4d2f20f69a5658328a761deadb1c':
  arm: Macroize the test for 'setend' CPU instruction support

Conflicts:
libavcodec/arm/h264dsp_init_arm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavformat/img2dec.c: Add a long_name to the piped image demuxers
Andreas Cadhalpun [Tue, 22 Jul 2014 01:32:03 +0000 (03:32 +0200)]
libavformat/img2dec.c: Add a long_name to the piped image demuxers

This fixes segfaults in gst-libav1.0 compiled against FFmpeg 2.3.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '16e6652286213014c28a9c3af70435e767d28638'
Michael Niedermayer [Tue, 22 Jul 2014 01:35:29 +0000 (03:35 +0200)]
Merge commit '16e6652286213014c28a9c3af70435e767d28638'

* commit '16e6652286213014c28a9c3af70435e767d28638':
  aarch64: NEON intrinsics dct_unquantize_h263.

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d'
Michael Niedermayer [Tue, 22 Jul 2014 01:06:43 +0000 (03:06 +0200)]
Merge commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d'

* commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d':
  configure: add support for neon intrinsics

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '389380c27915b0505fed538cd54c035c891fabd9'
Michael Niedermayer [Tue, 22 Jul 2014 00:59:46 +0000 (02:59 +0200)]
Merge commit '389380c27915b0505fed538cd54c035c891fabd9'

* commit '389380c27915b0505fed538cd54c035c891fabd9':
  http: Do move the class instantiation in the conditional block

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '28df1d24112c6ad0763985df2faeeb198cfbad69'
Michael Niedermayer [Tue, 22 Jul 2014 00:50:19 +0000 (02:50 +0200)]
Merge commit '28df1d24112c6ad0763985df2faeeb198cfbad69'

* commit '28df1d24112c6ad0763985df2faeeb198cfbad69':
  http: Provide an option to override the HTTP method

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'
Michael Niedermayer [Tue, 22 Jul 2014 00:45:45 +0000 (02:45 +0200)]
Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830'

* commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830':
  build: Support executable only ldflags

Conflicts:
Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b396bbad100a7493691d09b8dceba91e3cd28e2e'
Michael Niedermayer [Tue, 22 Jul 2014 00:40:00 +0000 (02:40 +0200)]
Merge commit 'b396bbad100a7493691d09b8dceba91e3cd28e2e'

* commit 'b396bbad100a7493691d09b8dceba91e3cd28e2e':
  configure: Do not add extralibs to avresample .pc file

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fc27e7272e6f1a7053812f8a15b1b7098de44c71'
Michael Niedermayer [Tue, 22 Jul 2014 00:33:05 +0000 (02:33 +0200)]
Merge commit 'fc27e7272e6f1a7053812f8a15b1b7098de44c71'

* commit 'fc27e7272e6f1a7053812f8a15b1b7098de44c71':
  mpegts: do not export empty language tags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mov: Pass through iTunSMPB from MOV.
Dale Curtis [Mon, 21 Jul 2014 19:05:08 +0000 (12:05 -0700)]
avformat/mov: Pass through iTunSMPB from MOV.

Allows demuxing of iTunes files into adts while preserving gapless
metadata.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/adtsenc: Optionally enable ID3 in ADTS.
Dale Curtis [Mon, 21 Jul 2014 19:05:08 +0000 (12:05 -0700)]
avformat/adtsenc: Optionally enable ID3 in ADTS.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoimgconvert: cosmetics: Reshuffle defines to reduce ifdeffery
Diego Biurrun [Mon, 21 Jul 2014 20:10:53 +0000 (13:10 -0700)]
imgconvert: cosmetics: Reshuffle defines to reduce ifdeffery

6 years agoarm: Macroize the test for 'setend' CPU instruction support
Ben Avison [Mon, 21 Jul 2014 13:53:06 +0000 (14:53 +0100)]
arm: Macroize the test for 'setend' CPU instruction support

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoaarch64: NEON intrinsics dct_unquantize_h263.
James Yu [Sat, 17 May 2014 04:21:10 +0000 (12:21 +0800)]
aarch64: NEON intrinsics dct_unquantize_h263.

Intrinsics only used on aarch64 since the existing ARMv7 NEON asm
is slightly faster (Cortex-A9, gcc-4.8, micro-benchmarks and full
decoding time).

Signed-off-by: James Yu <james.yu@linaro.org>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
6 years agoconfigure: add support for neon intrinsics
Janne Grunau [Tue, 13 May 2014 21:03:28 +0000 (23:03 +0200)]
configure: add support for neon intrinsics

6 years agoMerge commit '4d2d0595cf9dd199c35aefef450952d209a56573'
Michael Niedermayer [Mon, 21 Jul 2014 21:08:41 +0000 (23:08 +0200)]
Merge commit '4d2d0595cf9dd199c35aefef450952d209a56573'

* commit '4d2d0595cf9dd199c35aefef450952d209a56573':
  fate: Split audio- and video-related RealMedia targets

Conflicts:
tests/fate/real.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2ce53880bfeb431decdd2fc82298c0aff823ab47'
Michael Niedermayer [Mon, 21 Jul 2014 20:29:15 +0000 (22:29 +0200)]
Merge commit '2ce53880bfeb431decdd2fc82298c0aff823ab47'

* commit '2ce53880bfeb431decdd2fc82298c0aff823ab47':
  build: Conditionally compile all avcodec test programs

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohttp: Do move the class instantiation in the conditional block
Luca Barbato [Thu, 17 Jul 2014 22:55:05 +0000 (00:55 +0200)]
http: Do move the class instantiation in the conditional block

Remove a warning if https support is disabled.

6 years agohttp: Provide an option to override the HTTP method
Luca Barbato [Thu, 17 Jul 2014 22:39:43 +0000 (00:39 +0200)]
http: Provide an option to override the HTTP method

Certain servers accept only PUT as valid method.

6 years agobuild: Support executable only ldflags
Luca Barbato [Wed, 16 Jul 2014 15:00:11 +0000 (17:00 +0200)]
build: Support executable only ldflags

The options is useful to build position-independent executables on
hardened systems (e.g. Android L and Gentoo Hardened).

6 years agoconfigure: Do not add extralibs to avresample .pc file
Luca Barbato [Wed, 16 Jul 2014 14:33:13 +0000 (16:33 +0200)]
configure: Do not add extralibs to avresample .pc file

The library does not have external dependencies.

6 years agoMerge commit '16b7328058fa600d5158c84d9cc621a134eb88bc'
Michael Niedermayer [Mon, 21 Jul 2014 20:02:23 +0000 (22:02 +0200)]
Merge commit '16b7328058fa600d5158c84d9cc621a134eb88bc'

* commit '16b7328058fa600d5158c84d9cc621a134eb88bc':
  build: Conditionally build and run DCT test program

Conflicts:
libavcodec/Makefile
libavcodec/dct-test.c
tests/fate/libavcodec.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegts: do not export empty language tags
Jan Gerber [Mon, 21 Jul 2014 19:39:02 +0000 (19:39 +0000)]
mpegts: do not export empty language tags

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoMerge commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1'
Michael Niedermayer [Mon, 21 Jul 2014 19:35:02 +0000 (21:35 +0200)]
Merge commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1'

* commit 'bd499d9af668aef979ec9f3f3215b8dd508c7ec1':
  build: Conditionally build and test iirfilter

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/APIchanges: mention FF_INPUT_BUFFER_PADDING_SIZE chage
Michael Niedermayer [Mon, 21 Jul 2014 19:16:24 +0000 (21:16 +0200)]
doc/APIchanges: mention FF_INPUT_BUFFER_PADDING_SIZE chage

Suggested-by: Andreas Cadhalpun
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: Split audio- and video-related RealMedia targets
Katerina Barone-Adesi [Sun, 13 Jul 2014 21:47:05 +0000 (23:47 +0200)]
fate: Split audio- and video-related RealMedia targets

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoavutil/opt: Support general expressions involving AVOption constants in set_string_nu...
Michael Niedermayer [Mon, 21 Jul 2014 14:00:08 +0000 (16:00 +0200)]
avutil/opt: Support general expressions involving AVOption constants in set_string_number()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil: move QP2LAMBDA constant to eval
Michael Niedermayer [Mon, 21 Jul 2014 13:30:45 +0000 (15:30 +0200)]
avutil: move QP2LAMBDA constant to eval

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/opt: remove dead code from set_string_number()
Michael Niedermayer [Mon, 21 Jul 2014 13:28:36 +0000 (15:28 +0200)]
avutil/opt: remove dead code from set_string_number()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/opt.c: fix bug when parsing option
Muhammad Faiz [Mon, 21 Jul 2014 09:31:41 +0000 (02:31 -0700)]
avutil/opt.c: fix bug when parsing option

fix these strange behavior:
-af flanger=delay=10 [OK]
-af flanger=delay=1e1 [OK]
-af flanger=delay=1e+1 [Error]
-af flanger=delay=0.1 [OK]
-af flanger=delay=1e-1 [Error]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuild: Conditionally compile all avcodec test programs
Diego Biurrun [Mon, 21 Jul 2014 12:28:26 +0000 (05:28 -0700)]
build: Conditionally compile all avcodec test programs

6 years agobuild: Conditionally build and run DCT test program
Diego Biurrun [Mon, 21 Jul 2014 12:27:45 +0000 (05:27 -0700)]
build: Conditionally build and run DCT test program

6 years agobuild: Conditionally build and test iirfilter
Diego Biurrun [Mon, 21 Jul 2014 12:26:00 +0000 (05:26 -0700)]
build: Conditionally build and test iirfilter

6 years agoavcodec/dct-test: remove fixed array sizes
Michael Niedermayer [Mon, 21 Jul 2014 12:00:48 +0000 (14:00 +0200)]
avcodec/dct-test: remove fixed array sizes

They are unneeded and make adding elements slightly harder as they
would need to be constantly updated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c3ec963d0d0fac2d817f7fbce2e89ed46eeba550'
Michael Niedermayer [Mon, 21 Jul 2014 11:53:11 +0000 (13:53 +0200)]
Merge commit 'c3ec963d0d0fac2d817f7fbce2e89ed46eeba550'

* commit 'c3ec963d0d0fac2d817f7fbce2e89ed46eeba550':
  mjpeg: return proper error code

See: 2ebaadf35c9387610ca1eb7e94c171050562a77c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '81b9bf319226fe03436c80aaa8a2c91767cab7ce'
Michael Niedermayer [Mon, 21 Jul 2014 11:33:51 +0000 (13:33 +0200)]
Merge commit '81b9bf319226fe03436c80aaa8a2c91767cab7ce'

* commit '81b9bf319226fe03436c80aaa8a2c91767cab7ce':
  dct-test: Move arch-specific bits into arch-specific subdirectories

Conflicts:
libavcodec/dct-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a9f3f5fadb57bae3f3ff0be69e56b2c6014f2513'
Michael Niedermayer [Mon, 21 Jul 2014 11:02:33 +0000 (13:02 +0200)]
Merge commit 'a9f3f5fadb57bae3f3ff0be69e56b2c6014f2513'

* commit 'a9f3f5fadb57bae3f3ff0be69e56b2c6014f2513':
  Revert "tiff: support reading gray+alpha at 8 bits"

Not merged, the pix fmt its not unknown

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomjpeg: return proper error code
Nidhi Makhijani [Mon, 21 Jul 2014 07:11:46 +0000 (12:41 +0530)]
mjpeg: return proper error code

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agodct-test: Move arch-specific bits into arch-specific subdirectories
Diego Biurrun [Tue, 18 Feb 2014 13:15:55 +0000 (14:15 +0100)]
dct-test: Move arch-specific bits into arch-specific subdirectories

6 years agoRevert "tiff: support reading gray+alpha at 8 bits"
Janne Grunau [Mon, 21 Jul 2014 06:35:32 +0000 (08:35 +0200)]
Revert "tiff: support reading gray+alpha at 8 bits"

This reverts commit b31d76e45fc3c6529dd7109e721676f3ec376d00 as it
uses an unkown pixel format.

6 years agoavfilter/biquads: avoid clipping when using floating type
Muhammad Faiz [Thu, 17 Jul 2014 03:49:04 +0000 (10:49 +0700)]
avfilter/biquads: avoid clipping when using floating type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/sapenc: Use av_mallocz_array()
Michael Niedermayer [Mon, 21 Jul 2014 01:19:12 +0000 (03:19 +0200)]
avformat/sapenc: Use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_owdenoise: use av_malloc_array()
Michael Niedermayer [Mon, 21 Jul 2014 01:18:56 +0000 (03:18 +0200)]
avfilter/vf_owdenoise: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '819bb3e81c72939ae1c1a4e5fc3dfdf3e98df074'
Michael Niedermayer [Mon, 21 Jul 2014 00:22:17 +0000 (02:22 +0200)]
Merge commit '819bb3e81c72939ae1c1a4e5fc3dfdf3e98df074'

* commit '819bb3e81c72939ae1c1a4e5fc3dfdf3e98df074':
  fate: add h264-direct-bff test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c39059bea3adebcd888571d1181db215eee54495'
Michael Niedermayer [Mon, 21 Jul 2014 00:14:25 +0000 (02:14 +0200)]
Merge commit 'c39059bea3adebcd888571d1181db215eee54495'

* commit 'c39059bea3adebcd888571d1181db215eee54495':
  h264: Fix direct temporal mvs for bottom-field-first poc order

Conflicts:
libavcodec/h264_direct.c

See: ebd1c505d22ad96e044880755ed9f4cf7cab4f78
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b31d76e45fc3c6529dd7109e721676f3ec376d00'
Michael Niedermayer [Mon, 21 Jul 2014 00:01:22 +0000 (02:01 +0200)]
Merge commit 'b31d76e45fc3c6529dd7109e721676f3ec376d00'

* commit 'b31d76e45fc3c6529dd7109e721676f3ec376d00':
  tiff: support reading gray+alpha at 8 bits

See: f746f3790168bf898b629942868bda703e7f1045
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755'
Michael Niedermayer [Sun, 20 Jul 2014 23:56:01 +0000 (01:56 +0200)]
Merge commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755'

* commit '4de8b60684ce13dff3e3d372dae4f49b9e53f755':
  idct: Move arm-specific declarations to a header in the arm directory

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add h264-direct-bff test
Vittorio Giovara [Fri, 18 Jul 2014 13:54:46 +0000 (09:54 -0400)]
fate: add h264-direct-bff test

6 years agoh264: Fix direct temporal mvs for bottom-field-first poc order
Ronald S. Bultje [Thu, 17 Jul 2014 23:49:54 +0000 (01:49 +0200)]
h264: Fix direct temporal mvs for bottom-field-first poc order

Such files can be created using the --bff x264 option.

Sample-Id: h264_direct_temporal_mvs_bff.mkv
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agotiff: support reading gray+alpha at 8 bits
Carl Eugen Hoyos [Sun, 20 Jul 2014 06:34:19 +0000 (02:34 -0400)]
tiff: support reading gray+alpha at 8 bits

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agodoc: fix two spelling errors
Andreas Cadhalpun [Sun, 20 Jul 2014 21:34:57 +0000 (23:34 +0200)]
doc: fix two spelling errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoidct: Move arm-specific declarations to a header in the arm directory
Diego Biurrun [Tue, 18 Feb 2014 12:46:32 +0000 (13:46 +0100)]
idct: Move arm-specific declarations to a header in the arm directory

6 years agodoc/issue_tracker: Correct sub-domain for mailing list
Michael Niedermayer [Sun, 20 Jul 2014 18:57:53 +0000 (20:57 +0200)]
doc/issue_tracker: Correct sub-domain for mailing list

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9f99a5f1d078721a30a76aec27c58805b7b87e58'
Michael Niedermayer [Sun, 20 Jul 2014 18:32:17 +0000 (20:32 +0200)]
Merge commit '9f99a5f1d078721a30a76aec27c58805b7b87e58'

* commit '9f99a5f1d078721a30a76aec27c58805b7b87e58':
  mpegencconetxt: Move rv10-specific orig_width/orig_height where they belong

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: Add db0 for the website
db0company [Sun, 20 Jul 2014 14:38:49 +0000 (16:38 +0200)]
MAINTAINERS: Add db0 for the website

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegencconetxt: Move rv10-specific orig_width/orig_height where they belong
Nidhi Makhijani [Sun, 20 Jul 2014 09:21:38 +0000 (14:51 +0530)]
mpegencconetxt: Move rv10-specific orig_width/orig_height where they belong

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agomatroskaenc: Don't set language to empty string, use "und"
Jan Gerber [Sun, 20 Jul 2014 08:36:51 +0000 (10:36 +0200)]
matroskaenc: Don't set language to empty string, use "und"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate/hevc: update fate rext tests
Mickaël Raulet [Fri, 18 Jul 2014 21:40:52 +0000 (23:40 +0200)]
fate/hevc: update fate rext tests

cherry picked from commit e6ee89e6fab60a3faa1f933b7774e819846f70c4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: fix offset for sao temporary frame
Mickaël Raulet [Sat, 19 Jul 2014 23:50:19 +0000 (01:50 +0200)]
hevc: fix offset for sao temporary frame

fixes fate on alpha

cherry picked from commit 0a8ce1cbdaff7cd026bcf95ee3787bc7b4c063ee

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: restore default.css
Clément Bœsch [Sun, 20 Jul 2014 00:01:34 +0000 (02:01 +0200)]
doc: restore default.css

This partially reverts 9ce64ba111221a37bdd78204b67330a6120f6c50.

FATE still needs it until its design is updated to the new website
version.

6 years agodoc: update the documentation generator to match the new website
db0 [Sun, 13 Jul 2014 20:48:23 +0000 (22:48 +0200)]
doc: update the documentation generator to match the new website

Signed-off-by: db0 <db0company@gmail.com>
Signed-off-by: Clément Bœsch <u@pkh.me>
6 years agoswscale/utils: fix rgb -> fullrange yuv
Michael Niedermayer [Sat, 19 Jul 2014 21:08:29 +0000 (23:08 +0200)]
swscale/utils: fix rgb -> fullrange yuv

Fixes part of Ticket3785

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale/utils: remove unused define
Michael Niedermayer [Sat, 19 Jul 2014 20:45:43 +0000 (22:45 +0200)]
swscale/utils: remove unused define

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/dvenc: Implement 32khz & 44.1khz for 25/50fps
Michael Niedermayer [Wed, 16 Jul 2014 22:54:34 +0000 (00:54 +0200)]
avformat/dvenc: Implement 32khz & 44.1khz for 25/50fps

30000/1001 fps isnt implemented as i dont know which are the correct interleaving parameters,
pointers to the appropriate spec and page are welcome

Fixes Ticket2597

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/seek: use av_malloc_array()
Michael Niedermayer [Sat, 19 Jul 2014 17:44:56 +0000 (19:44 +0200)]
avformat/seek: use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/avfilter: use av_malloc(z)_array()
Michael Niedermayer [Sat, 19 Jul 2014 17:42:46 +0000 (19:42 +0200)]
avfilter/avfilter: use av_malloc(z)_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc_ps: Check abs_delta_rps
Michael Niedermayer [Sat, 19 Jul 2014 15:29:46 +0000 (17:29 +0200)]
avcodec/hevc_ps: Check abs_delta_rps

Fixes integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: check nb_cpb
Michael Niedermayer [Sat, 19 Jul 2014 14:43:13 +0000 (16:43 +0200)]
avcodec/hevc: check nb_cpb

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: use intreadwrite
Christophe Gisquet [Sat, 12 Jul 2014 14:51:09 +0000 (16:51 +0200)]
hevc: use intreadwrite

When dealing with MVs, both components may be processed at a time.

On Win64, 560 to 539 cycles for derive_spatial_merge_candidates.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavutil: document side effects of macros
Christophe Gisquet [Thu, 10 Jul 2014 18:49:06 +0000 (20:49 +0200)]
libavutil: document side effects of macros

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: report more precise progress
Christophe Gisquet [Sat, 19 Jul 2014 08:30:06 +0000 (10:30 +0200)]
hevc: report more precise progress

There's a lag of one CTB line for SAO behind deblocking filter, except for
last line. However, once SAO has been completed on a line, all its pixels,
i.e. up to y+ctb_size are filtered and ready to be used as reference.

Without SAO, when deblocking filter finishes a CTB line, only the bottom
bottom 4 pixels may be filtered when next CTB is process by the deblocing.

The await_progess for hevc then checks whether the bottom pixels of a PU
requires access beyond that point, so the reporting should effectively
report up to the the above limits.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1a583c0c60240adb8fa6620c6df33f1a0a0fe5d9'
Michael Niedermayer [Sat, 19 Jul 2014 12:10:20 +0000 (14:10 +0200)]
Merge commit '1a583c0c60240adb8fa6620c6df33f1a0a0fe5d9'

* commit '1a583c0c60240adb8fa6620c6df33f1a0a0fe5d9':
  fdct: Move ppc-specific declarations to a header in the ppc directory

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5dcc201505f71b1e73e9eef12ce89d4eed252ad0'
Michael Niedermayer [Sat, 19 Jul 2014 11:56:08 +0000 (13:56 +0200)]
Merge commit '5dcc201505f71b1e73e9eef12ce89d4eed252ad0'

* commit '5dcc201505f71b1e73e9eef12ce89d4eed252ad0':
  simple_idct: Move x86-specific declarations to a header in the x86 directory

Conflicts:
libavcodec/x86/simple_idct.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '85cabb8d002f2cd100ced5cc17d87bfc9460d314'
Michael Niedermayer [Sat, 19 Jul 2014 11:45:30 +0000 (13:45 +0200)]
Merge commit '85cabb8d002f2cd100ced5cc17d87bfc9460d314'

* commit '85cabb8d002f2cd100ced5cc17d87bfc9460d314':
  fdct: Move x86-specific declarations to a header in the x86 directory

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'
Michael Niedermayer [Sat, 19 Jul 2014 11:39:12 +0000 (13:39 +0200)]
Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'

* commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e':
  oss_audio: Split muxer and demuxer

Conflicts:
libavdevice/Makefile
libavdevice/oss_audio.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale/x86/hscale_fast_bilinear_simd: add inline asm guards
Michael Niedermayer [Sat, 19 Jul 2014 11:12:52 +0000 (13:12 +0200)]
swscale/x86/hscale_fast_bilinear_simd: add inline asm guards

Should fix MSVC build

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofdct: Move ppc-specific declarations to a header in the ppc directory
Diego Biurrun [Tue, 18 Feb 2014 13:09:35 +0000 (14:09 +0100)]
fdct: Move ppc-specific declarations to a header in the ppc directory

6 years agosimple_idct: Move x86-specific declarations to a header in the x86 directory
Diego Biurrun [Tue, 18 Feb 2014 12:20:01 +0000 (13:20 +0100)]
simple_idct: Move x86-specific declarations to a header in the x86 directory

6 years agofdct: Move x86-specific declarations to a header in the x86 directory
Diego Biurrun [Tue, 18 Feb 2014 12:16:11 +0000 (13:16 +0100)]
fdct: Move x86-specific declarations to a header in the x86 directory

6 years agosws: move inline asm hscale to MMX_OBJS
Michael Niedermayer [Sat, 19 Jul 2014 03:47:48 +0000 (05:47 +0200)]
sws: move inline asm hscale to MMX_OBJS

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