]> git.sesse.net Git - ffmpeg/log
ffmpeg
9 years agoMerge commit '6133d65861f265d429ade53e910fe877c95a1615'
Michael Niedermayer [Wed, 23 Jul 2014 23:22:31 +0000 (01:22 +0200)]
Merge commit '6133d65861f265d429ade53e910fe877c95a1615'

* commit '6133d65861f265d429ade53e910fe877c95a1615':
  fft-test: K&R formatting cosmetics

Conflicts:
libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/fft-test: fix memory alloc checks
Michael Niedermayer [Wed, 23 Jul 2014 22:46:15 +0000 (00:46 +0200)]
avcodec/fft-test: fix memory alloc checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9'
Michael Niedermayer [Wed, 23 Jul 2014 22:35:40 +0000 (00:35 +0200)]
Merge commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9'

* commit 'c3c96deb5f8cbbdb700ba97920ceedddacb5dcb9':
  fft-test: Check memory allocations

Conflicts:
libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agox86: hevcdsp: align
Christophe Gisquet [Tue, 22 Jul 2014 08:57:34 +0000 (10:57 +0200)]
x86: hevcdsp: align

Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofft-test: K&R formatting cosmetics
Diego Biurrun [Fri, 18 Jul 2014 12:37:11 +0000 (05:37 -0700)]
fft-test: K&R formatting cosmetics

Also rearrange #includes into canonical order.

9 years agohevc_mvs: avoid deriving tmvp in amvp
Christophe Gisquet [Wed, 23 Jul 2014 16:27:44 +0000 (18:27 +0200)]
hevc_mvs: avoid deriving tmvp in amvp

Reduces on a sequence number of calls from 933685 to 586271.

Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agohevcdsp: change types of SAO parameters
Christophe Gisquet [Wed, 23 Jul 2014 11:39:40 +0000 (13:39 +0200)]
hevcdsp: change types of SAO parameters

From openhevc

Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '7288b345850792430302a8f85a4b29140b770497'
Michael Niedermayer [Wed, 23 Jul 2014 18:48:05 +0000 (20:48 +0200)]
Merge commit '7288b345850792430302a8f85a4b29140b770497'

* commit '7288b345850792430302a8f85a4b29140b770497':
  fft-test: Drop unnecessary pointer indirection for context structs

Conflicts:
libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb'
Michael Niedermayer [Wed, 23 Jul 2014 18:40:41 +0000 (20:40 +0200)]
Merge commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb'

* commit 'd445c865f87e7f13230e4dac3f77f5af21da95cb':
  fft-test: Reduce variable scope where sensibly possible

Conflicts:
libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'eac77fcd56fc2a3391f0d86faf54302afb368ff7'
Michael Niedermayer [Wed, 23 Jul 2014 18:20:04 +0000 (20:20 +0200)]
Merge commit 'eac77fcd56fc2a3391f0d86faf54302afb368ff7'

* commit 'eac77fcd56fc2a3391f0d86faf54302afb368ff7':
  mpegenccontext: Remove unused dct_unquantize_h261 function pointers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavd/lavfi: work with non-mappable files for graph_file option
Andrey Utkin [Wed, 23 Jul 2014 13:12:39 +0000 (16:12 +0300)]
lavd/lavfi: work with non-mappable files for graph_file option

Example of non-mappable file is /dev/stdin. Previously passing it as
graph_file value returned error.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavio: Introduce avio_read_to_bprint(avioctx, bp, max_size)
Andrey Utkin [Wed, 23 Jul 2014 13:12:38 +0000 (16:12 +0300)]
avio: Introduce avio_read_to_bprint(avioctx, bp, max_size)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavformat/flvdec: use AV_PKT_DATA_NEW_EXTRADATA for h264 too
Michael Niedermayer [Wed, 23 Jul 2014 15:08:56 +0000 (17:08 +0200)]
avformat/flvdec: use AV_PKT_DATA_NEW_EXTRADATA for h264 too

Fixes Ticket 3787

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/h264: support AV_PKT_DATA_NEW_EXTRADATA
Michael Niedermayer [Wed, 23 Jul 2014 15:39:30 +0000 (17:39 +0200)]
avcodec/h264: support AV_PKT_DATA_NEW_EXTRADATA

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec/h264: factor is_extra() out
Michael Niedermayer [Wed, 23 Jul 2014 15:38:41 +0000 (17:38 +0200)]
avcodec/h264: factor is_extra() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofft-test: Check memory allocations
Diego Biurrun [Mon, 21 Jul 2014 09:12:32 +0000 (02:12 -0700)]
fft-test: Check memory allocations

9 years agofft-test: Drop unnecessary pointer indirection for context structs
Diego Biurrun [Thu, 26 Jun 2014 23:14:30 +0000 (16:14 -0700)]
fft-test: Drop unnecessary pointer indirection for context structs

9 years agofft-test: Reduce variable scope where sensibly possible
Diego Biurrun [Thu, 26 Jun 2014 00:35:03 +0000 (17:35 -0700)]
fft-test: Reduce variable scope where sensibly possible

Also merge variable declaration and initialization.

9 years agoMerge commit '20ec0daaa1cdd3996ac6ed0198de961129474044'
Michael Niedermayer [Wed, 23 Jul 2014 12:26:55 +0000 (14:26 +0200)]
Merge commit '20ec0daaa1cdd3996ac6ed0198de961129474044'

* commit '20ec0daaa1cdd3996ac6ed0198de961129474044':
  fft-test: Make global exptab variable static

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb'
Michael Niedermayer [Wed, 23 Jul 2014 12:15:20 +0000 (14:15 +0200)]
Merge commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb'

* commit '2b6ab3a2bd7e7cee5e7a55dd2e48b8feb4a826bb':
  mpegvideo: Move QUANT_BIAS_SHIFT define to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agompegenccontext: Remove unused dct_unquantize_h261 function pointers
Nidhi Makhijani [Wed, 23 Jul 2014 11:57:01 +0000 (17:27 +0530)]
mpegenccontext: Remove unused dct_unquantize_h261 function pointers

Signed-off-by: Diego Biurrun <diego@biurrun.de>
9 years agofft-test: Make global exptab variable static
Diego Biurrun [Mon, 21 Jul 2014 08:53:16 +0000 (01:53 -0700)]
fft-test: Make global exptab variable static

9 years agompegvideo: Move QUANT_BIAS_SHIFT define to the only place it is used
Diego Biurrun [Tue, 22 Jul 2014 18:10:13 +0000 (11:10 -0700)]
mpegvideo: Move QUANT_BIAS_SHIFT define to the only place it is used

9 years agoavcodec/x86/hevc_deblock: Fix compilation with nasm.
Carl Eugen Hoyos [Tue, 22 Jul 2014 22:51:29 +0000 (00:51 +0200)]
avcodec/x86/hevc_deblock: Fix compilation with nasm.

9 years agoavutil/opt: Fix parsing regression with constants starting with numbers
Michael Niedermayer [Wed, 23 Jul 2014 06:36:24 +0000 (08:36 +0200)]
avutil/opt: Fix parsing regression with constants starting with numbers

Fixes parsing "3dnow"

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoChangelog: add "version <next>:" so people dont add new things to the last release
Michael Niedermayer [Wed, 23 Jul 2014 00:37:26 +0000 (02:37 +0200)]
Changelog: add "version <next>:" so people dont add new things to the last release

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '06a1d1323bc8afd03f085ae98d9b74e431b3534e'
Michael Niedermayer [Tue, 22 Jul 2014 22:34:16 +0000 (00:34 +0200)]
Merge commit '06a1d1323bc8afd03f085ae98d9b74e431b3534e'

* commit '06a1d1323bc8afd03f085ae98d9b74e431b3534e':
  configure: Extend the neon intrinsics check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc'
Michael Niedermayer [Tue, 22 Jul 2014 22:29:06 +0000 (00:29 +0200)]
Merge commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc'

* commit '5be7d8597d02bcaba2de2503c0e59cf865c746dc':
  fft-test: Comment some #endifs

Conflicts:
libavcodec/fft-test.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '57f1b1dcc77a93c2a5c503d4e47fe2f567cf9db5'
Michael Niedermayer [Tue, 22 Jul 2014 22:23:15 +0000 (00:23 +0200)]
Merge commit '57f1b1dcc77a93c2a5c503d4e47fe2f567cf9db5'

* commit '57f1b1dcc77a93c2a5c503d4e47fe2f567cf9db5':
  fft-test: Drop unnecessary #ifdefs around header includes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavcodec: dct/rdft only support float mode, skip their contents for fixed point
Michael Niedermayer [Tue, 22 Jul 2014 21:57:30 +0000 (23:57 +0200)]
avcodec: dct/rdft only support float mode, skip their contents for fixed point

9 years agoMerge commit '11c7155cce50971a38e6cebd39a3ba5a54645fae'
Michael Niedermayer [Tue, 22 Jul 2014 20:40:42 +0000 (22:40 +0200)]
Merge commit '11c7155cce50971a38e6cebd39a3ba5a54645fae'

* commit '11c7155cce50971a38e6cebd39a3ba5a54645fae':
  dct/rdft: Add missing typedefs for context structs

Not merged, as it breaks build

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoconfigure: Extend the neon intrinsics check
Martin Storsjö [Tue, 22 Jul 2014 12:09:43 +0000 (15:09 +0300)]
configure: Extend the neon intrinsics check

Check for an instruction that causes the (very old) Apple GCC 4.2
to error out ("unrecognizable insn").

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoMerge commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd'
Michael Niedermayer [Tue, 22 Jul 2014 20:32:40 +0000 (22:32 +0200)]
Merge commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd'

* commit 'eba2233b58c2c4b468c58287d6537b2f1188a8cd':
  build: Add define for SIMD extensions requiring 16-byte aligned buffers

Conflicts:
configure
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '67bc1ba5d75953d136bfa02ce6c0a27e9fd9dac3'
Michael Niedermayer [Tue, 22 Jul 2014 20:09:39 +0000 (22:09 +0200)]
Merge commit '67bc1ba5d75953d136bfa02ce6c0a27e9fd9dac3'

* commit '67bc1ba5d75953d136bfa02ce6c0a27e9fd9dac3':
  libxvid: Drop PPC-specific CPU detection hack

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532'
Michael Niedermayer [Tue, 22 Jul 2014 20:02:48 +0000 (22:02 +0200)]
Merge commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532'

* commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532':
  http: Use a constant for the supported header size

Conflicts:
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofft-test: Comment some #endifs
Diego Biurrun [Fri, 18 Jul 2014 12:07:30 +0000 (05:07 -0700)]
fft-test: Comment some #endifs

9 years agofft-test: Drop unnecessary #ifdefs around header includes
Diego Biurrun [Fri, 18 Jul 2014 12:06:32 +0000 (05:06 -0700)]
fft-test: Drop unnecessary #ifdefs around header includes

9 years agodct/rdft: Add missing typedefs for context structs
Diego Biurrun [Fri, 18 Jul 2014 13:07:26 +0000 (06:07 -0700)]
dct/rdft: Add missing typedefs for context structs

Without the typedefs there can be trouble depending on #include order.

9 years agobuild: Add define for SIMD extensions requiring 16-byte aligned buffers
Diego Biurrun [Mon, 21 Jul 2014 20:58:55 +0000 (13:58 -0700)]
build: Add define for SIMD extensions requiring 16-byte aligned buffers

9 years agolibxvid: Drop PPC-specific CPU detection hack
Diego Biurrun [Mon, 21 Jul 2014 20:11:40 +0000 (13:11 -0700)]
libxvid: Drop PPC-specific CPU detection hack

It is doubtful if the hack (still) works and Xvid had ten years to fix it.

9 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Tue, 22 Jul 2014 16:23:49 +0000 (18:23 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Autodetect big-endian tiff files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agohevc: wait proper position for tmvp
Christophe Gisquet [Sun, 20 Jul 2014 07:34:58 +0000 (09:34 +0200)]
hevc: wait proper position for tmvp

The position is either rounded or not checked, so delay the wait to
check the proper value.

Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoAutodetect big-endian tiff files.
Carl Eugen Hoyos [Tue, 22 Jul 2014 15:15:20 +0000 (17:15 +0200)]
Autodetect big-endian tiff files.

9 years agoavcodec/mjpegdec: add pix_fmt: 0x14121200
Przemysław Sobala [Tue, 22 Jul 2014 13:52:41 +0000 (15:52 +0200)]
avcodec/mjpegdec: add pix_fmt: 0x14121200

Fixes: _15801_F.jpg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil/opt: simplify set_string_number()
Michael Niedermayer [Tue, 22 Jul 2014 15:33:06 +0000 (17:33 +0200)]
avutil/opt: simplify set_string_number()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil/opt: set_string_number(): remove unneeded copy
Muhammad Faiz [Tue, 22 Jul 2014 06:39:43 +0000 (23:39 -0700)]
avutil/opt: set_string_number(): remove unneeded copy

also remove unused variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agohttp: Use a constant for the supported header size
Luca Barbato [Tue, 22 Jul 2014 14:37:09 +0000 (16:37 +0200)]
http: Use a constant for the supported header size

9 years agoavcodec/x86/hevcdsp_init: Fix "warning: assignment from incompatible pointer type"
Michael Niedermayer [Tue, 22 Jul 2014 14:36:12 +0000 (16:36 +0200)]
avcodec/x86/hevcdsp_init: Fix "warning: assignment from incompatible pointer type"

9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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).

9 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.

9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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

9 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>
9 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>
9 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

9 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>
9 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>
9 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.

9 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.

9 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).

9 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.

9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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>
9 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

9 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