ffmpeg.git
5 years agoUpdate for 2.2-rc1 n2.2-rc1
Michael Niedermayer [Sat, 1 Mar 2014 02:53:09 +0000 (03:53 +0100)]
Update for 2.2-rc1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoupdate for 2.2
Michael Niedermayer [Sat, 1 Mar 2014 02:34:59 +0000 (03:34 +0100)]
update for 2.2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utvideoenc: fix slice_bits size
Michael Niedermayer [Sat, 1 Mar 2014 01:40:19 +0000 (02:40 +0100)]
avcodec/utvideoenc: fix slice_bits size

Fixes assertion failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/ac3dec: Use avpriv_ac3_parse_header2()
Michael Niedermayer [Sat, 1 Mar 2014 00:56:25 +0000 (01:56 +0100)]
avformat/ac3dec: Use avpriv_ac3_parse_header2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ac3_parser: add avpriv_ac3_parse_header2() and use it in libavcodec
Michael Niedermayer [Sat, 1 Mar 2014 00:47:33 +0000 (01:47 +0100)]
avcodec/ac3_parser: add avpriv_ac3_parse_header2() and use it in libavcodec

The new function has the ability to allocate the structure, allowing it to grow
without needing major bumps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ac3: move new field to the end of AC3HeaderInfo
Michael Niedermayer [Sat, 1 Mar 2014 00:45:49 +0000 (01:45 +0100)]
avcodec/ac3: move new field to the end of AC3HeaderInfo

This structure is used in the interface between libs and thus cannot have
fields added in the middle without major bump

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/opt: allow max=min=0 for pixel formats
Michael Niedermayer [Fri, 28 Feb 2014 22:55:34 +0000 (23:55 +0100)]
avutil/opt: allow max=min=0 for pixel formats

This is neccessary for maintaining ABI compatibility with FFmpeg 2.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 28 Feb 2014 21:39:54 +0000 (22:39 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  latm: Always reconfigure if no extradata was set previously

See: d039b6074ca68da9b6dc88d8bb40056fee9fecb6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6e4009d4cdf5927bdaedf58fcfc5e813b14c366b'
Michael Niedermayer [Fri, 28 Feb 2014 20:52:14 +0000 (21:52 +0100)]
Merge commit '6e4009d4cdf5927bdaedf58fcfc5e813b14c366b'

* commit '6e4009d4cdf5927bdaedf58fcfc5e813b14c366b':
  arm: dcadsp: implement decode_hf as external NEON asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4cb6964244fd6c099383d8b7e99731e72cc844b9'
Michael Niedermayer [Fri, 28 Feb 2014 20:41:19 +0000 (21:41 +0100)]
Merge commit '4cb6964244fd6c099383d8b7e99731e72cc844b9'

* commit '4cb6964244fd6c099383d8b7e99731e72cc844b9':
  dcadec: simplify decoding of VQ high frequencies

Conflicts:
configure
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dcadec: use brackets to ensure that no slow division is used
Michael Niedermayer [Fri, 28 Feb 2014 20:31:07 +0000 (21:31 +0100)]
avcodec/dcadec: use brackets to ensure that no slow division is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7686afd049be98d18663682b92d983340fa2c305'
Michael Niedermayer [Fri, 28 Feb 2014 20:29:45 +0000 (21:29 +0100)]
Merge commit '7686afd049be98d18663682b92d983340fa2c305'

* commit '7686afd049be98d18663682b92d983340fa2c305':
  dca: factorize scaling in inverse ADPCM

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '08e3ea60ff4059341b74be04a428a38f7c3630b0'
Michael Niedermayer [Fri, 28 Feb 2014 19:38:12 +0000 (20:38 +0100)]
Merge commit '08e3ea60ff4059341b74be04a428a38f7c3630b0'

* commit '08e3ea60ff4059341b74be04a428a38f7c3630b0':
  x86: synth filter float: implement SSE2 version

Conflicts:
libavcodec/x86/dcadsp.asm
libavcodec/x86/dcadsp_init.c

See: 2cdbcc004837ce092a14f326f24d97a29512a2c3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: synth filter float: implement SSE2 version
Christophe Gisquet [Fri, 14 Feb 2014 16:00:48 +0000 (16:00 +0000)]
x86: synth filter float: implement SSE2 version

Timings for Arrandale:
          C    SSE
win32:  2108   334
win64:  1152   322

Factorizing the inner loop with a call/jmp is a >15 cycles cost, even with
the jmp destination being aligned.

Unrolling for ARCH_X86_64 is a 20 cycles gain.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '57b1eb9f75b04571063ddec316e290c216c114ac'
Michael Niedermayer [Fri, 28 Feb 2014 18:40:18 +0000 (19:40 +0100)]
Merge commit '57b1eb9f75b04571063ddec316e290c216c114ac'

* commit '57b1eb9f75b04571063ddec316e290c216c114ac':
  dcadsp: scan coefficients linearly in dca_lfe_fir

Conflicts:
libavcodec/dcadsp.c

See: 9ae8e23188fc2e533eea74757c9060557941d3d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ad507d7907457e678900bac132122ba7be4644cb'
Michael Niedermayer [Fri, 28 Feb 2014 18:22:00 +0000 (19:22 +0100)]
Merge commit 'ad507d7907457e678900bac132122ba7be4644cb'

* commit 'ad507d7907457e678900bac132122ba7be4644cb':
  x86: dcadsp: implement SSE lfe_dir

Conflicts:
libavcodec/x86/dcadsp.asm

See: 169243112c1e310d90c030fb258092f6d2e46117
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: dcadsp: implement SSE lfe_dir
Christophe Gisquet [Fri, 14 Feb 2014 16:00:46 +0000 (16:00 +0000)]
x86: dcadsp: implement SSE lfe_dir

Results for Arrandale/Windows:
32: 1670 -> 316
64:  728 -> 298

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '87ec849fe9acba075c843e67bcd01f256f481a18'
Michael Niedermayer [Fri, 28 Feb 2014 17:14:12 +0000 (18:14 +0100)]
Merge commit '87ec849fe9acba075c843e67bcd01f256f481a18'

* commit '87ec849fe9acba075c843e67bcd01f256f481a18':
  dcadec: remove scaling in lfe_interpolation_fir

Conflicts:
libavcodec/dcadec.c
libavcodec/dcadsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a55546f48d55e3d1155840541b2be5f4f8cf18ab'
Michael Niedermayer [Fri, 28 Feb 2014 17:05:13 +0000 (18:05 +0100)]
Merge commit 'a55546f48d55e3d1155840541b2be5f4f8cf18ab'

* commit 'a55546f48d55e3d1155840541b2be5f4f8cf18ab':
  proresenc: Reuse proper dsputil infrastructure for FDCT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '92e598a57a7ce4b8ac9ea56274af39f5fd888311'
Michael Niedermayer [Fri, 28 Feb 2014 16:54:32 +0000 (17:54 +0100)]
Merge commit '92e598a57a7ce4b8ac9ea56274af39f5fd888311'

* commit '92e598a57a7ce4b8ac9ea56274af39f5fd888311':
  prores: Drop DSP infrastructure for prores encoder bits

Conflicts:
libavcodec/Makefile
libavcodec/proresdsp.c
libavcodec/proresenc_kostya.c

Note, these changes only affect one of the 2 prores encoders we have
If someone wants to add optimizations to the affected encoder, or needs/wants
this infrastructure, then iam happy to revert this

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd6acefe05862af244fd5a30ae946ed507c063994'
Michael Niedermayer [Fri, 28 Feb 2014 16:26:37 +0000 (17:26 +0100)]
Merge commit 'd6acefe05862af244fd5a30ae946ed507c063994'

* commit 'd6acefe05862af244fd5a30ae946ed507c063994':
  proresenc: Drop unnecessary DCT permutation bits

Conflicts:
libavcodec/proresenc_kostya.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b23650491fbd579a4365f42bd42575afb7b53f7e'
Michael Niedermayer [Fri, 28 Feb 2014 16:13:00 +0000 (17:13 +0100)]
Merge commit 'b23650491fbd579a4365f42bd42575afb7b53f7e'

* commit 'b23650491fbd579a4365f42bd42575afb7b53f7e':
  prores: Use consistent names for DSP arch initialization functions

Conflicts:
libavcodec/proresdsp.c
libavcodec/proresdsp.h
libavcodec/x86/proresdsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolatm: Always reconfigure if no extradata was set previously
Hendrik Leppkes [Thu, 22 Dec 2011 23:14:32 +0000 (00:14 +0100)]
latm: Always reconfigure if no extradata was set previously

AAC LOAS can have new audio config objects in the stream itself.

Make sure the decoder reconfigures itself when the first one arrives
midstream.

Bug-Id: 644
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavcodec/msvideo1: Fix palette in case of seek before decode
Michael Niedermayer [Fri, 28 Feb 2014 12:20:22 +0000 (13:20 +0100)]
avcodec/msvideo1: Fix palette in case of seek before decode

Fixes Ticket3212

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoarm: dcadsp: implement decode_hf as external NEON asm
Janne Grunau [Sat, 22 Feb 2014 17:27:10 +0000 (18:27 +0100)]
arm: dcadsp: implement decode_hf as external NEON asm

5 years agodcadec: simplify decoding of VQ high frequencies
Christophe Gisquet [Fri, 14 Feb 2014 15:03:13 +0000 (15:03 +0000)]
dcadec: simplify decoding of VQ high frequencies

The vector dequantization has a test in a loop preventing effective SIMD
implementation. By moving it out of the loop, this loop can be DSPized.

Therefore, modify the current DSP implementation. In particular, the
DSP implementation no longer has to handle null loop sizes.

The decode_hf implementations have following timings:

For x86 Arrandale:
        C  SSE SSE2 SSE4
win32: 260 162  119  104
win64: 242 N/A   89   72

The arm NEON optimizations follow in a later patch as external asm. The
now unused check for the y modifier in arm inline asm is removed from
configure.

5 years agodca: factorize scaling in inverse ADPCM
Janne Grunau [Fri, 21 Feb 2014 12:13:36 +0000 (13:13 +0100)]
dca: factorize scaling in inverse ADPCM

Based on a patch from Christophe Gisquet.

Unrolling of the m == 0 case avoids a possible use of the uninitilized
value sum when s->predictor_history is not set. I failed to find a
sample for it. It also reduced the cycle count from 220 to 150 on
sandy bridge, x86_64 linux, gcc 4.8.2 compared to his patch.

5 years agox86: synth filter float: implement SSE2 version
Christophe Gisquet [Fri, 14 Feb 2014 15:03:09 +0000 (15:03 +0000)]
x86: synth filter float: implement SSE2 version

Timings for Arrandale:
          C    SSE
win32:  2108   334
win64:  1152   322

Factorizing the inner loop with a call/jmp is a >15 cycles cost, even with
the jmp destination being aligned.

Unrolling for ARCH_X86_64 is a 20 cycles gain.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
5 years agodcadsp: scan coefficients linearly in dca_lfe_fir
Christophe Gisquet [Fri, 14 Feb 2014 15:03:08 +0000 (15:03 +0000)]
dcadsp: scan coefficients linearly in dca_lfe_fir

This change is inspired by x86 asm where it frees a register.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
5 years agox86: dcadsp: implement SSE lfe_dir
Christophe Gisquet [Fri, 14 Feb 2014 15:03:07 +0000 (15:03 +0000)]
x86: dcadsp: implement SSE lfe_dir

Results for Arrandale/Windows:
32: 1670 -> 316
64:  728 -> 298

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
5 years agodcadec: remove scaling in lfe_interpolation_fir
Christophe Gisquet [Fri, 14 Feb 2014 15:03:06 +0000 (15:03 +0000)]
dcadec: remove scaling in lfe_interpolation_fir

The scaling factor is constant so it is faster to scale the
FIR coefficients in the tables during compilation.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
5 years agoproresenc: Reuse proper dsputil infrastructure for FDCT
Diego Biurrun [Thu, 27 Feb 2014 22:49:55 +0000 (14:49 -0800)]
proresenc: Reuse proper dsputil infrastructure for FDCT

5 years agoprores: Drop DSP infrastructure for prores encoder bits
Diego Biurrun [Thu, 27 Feb 2014 22:49:54 +0000 (14:49 -0800)]
prores: Drop DSP infrastructure for prores encoder bits

None of the encoder bits are arch-optimized.

5 years agoproresenc: Drop unnecessary DCT permutation bits
Diego Biurrun [Thu, 27 Feb 2014 22:49:53 +0000 (14:49 -0800)]
proresenc: Drop unnecessary DCT permutation bits

No permutation is necessary for the FDCT.

5 years agoprores: Use consistent names for DSP arch initialization functions
Diego Biurrun [Thu, 27 Feb 2014 22:49:52 +0000 (14:49 -0800)]
prores: Use consistent names for DSP arch initialization functions

5 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Fri, 28 Feb 2014 02:31:07 +0000 (03:31 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  lavfi/frei0r: factorize plugin loading with static path
  lavfi/frei0r: search plugins in lib64 dirs on all architectures

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Fri, 28 Feb 2014 01:14:17 +0000 (02:14 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavf/ftp: fix seek to nagative position
  lavf/libssh: fix seek to nagative position

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 28 Feb 2014 01:06:34 +0000 (02:06 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Give IDCT matrix transpose macro a more descriptive name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/ftp: fix seek to nagative position
Lukasz Marek [Thu, 27 Feb 2014 23:07:31 +0000 (00:07 +0100)]
lavf/ftp: fix seek to nagative position

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolavf/libssh: fix seek to nagative position
Lukasz Marek [Thu, 27 Feb 2014 23:04:29 +0000 (00:04 +0100)]
lavf/libssh: fix seek to nagative position

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agox86/imdct36: use sse3 instructions in the last BUTTERF step when possible
James Almer [Thu, 27 Feb 2014 17:40:28 +0000 (14:40 -0300)]
x86/imdct36: use sse3 instructions in the last BUTTERF step when possible

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86/imdct36: don't build imdct36_float_sse on x86_64 targets
James Almer [Thu, 27 Feb 2014 05:07:58 +0000 (02:07 -0300)]
x86/imdct36: don't build imdct36_float_sse on x86_64 targets

There's an SSE2 version as well, and x86_64 guarantees that
instruction set is present.

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoGive IDCT matrix transpose macro a more descriptive name
Diego Biurrun [Tue, 18 Feb 2014 17:57:45 +0000 (09:57 -0800)]
Give IDCT matrix transpose macro a more descriptive name

This also avoids a macro name clash and related warning on ARM.

5 years agoavcodec/mjpegdec: convert CMYK to GBRAP
Michael Niedermayer [Thu, 27 Feb 2014 20:55:31 +0000 (21:55 +0100)]
avcodec/mjpegdec: convert CMYK to GBRAP

Fixes Ticket2799

This should be moved into swscale once we have a CMYK pixel format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: fix decoding 4th plane
Michael Niedermayer [Thu, 27 Feb 2014 20:49:46 +0000 (21:49 +0100)]
avcodec/mjpegdec: fix decoding 4th plane

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: Print error in case of CMYK
Michael Niedermayer [Thu, 27 Feb 2014 19:02:40 +0000 (20:02 +0100)]
avcodec/mjpegdec: Print error in case of CMYK

Also fail if AV_EF_EXPLODE is set.
We do not fail by default, but rather return some image as it may be usefull to the
end user to see what is on the image, for example text could be read quite fine and
objects recognized.

Possibly fixes Ticket3424

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: parse adobe_transform
Michael Niedermayer [Thu, 27 Feb 2014 19:02:20 +0000 (20:02 +0100)]
avcodec/mjpegdec: parse adobe_transform

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: Print human readable string for APPx
Michael Niedermayer [Thu, 27 Feb 2014 18:35:37 +0000 (19:35 +0100)]
avcodec/mjpegdec: Print human readable string for APPx

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix http authentication.
Carl Eugen Hoyos [Wed, 26 Feb 2014 08:51:06 +0000 (09:51 +0100)]
Fix http authentication.

Add parenthesis around "MD5" in the request string as required by
RFC 2069.

Fixes ticket #3417.

Reported and tested by Haarman
Analyzed-by: Eugen-Andrei Gavriloaie
5 years agoavcodec/h264: allow mixing idr and non idr slices with frame threading again
Michael Niedermayer [Thu, 27 Feb 2014 14:49:25 +0000 (15:49 +0100)]
avcodec/h264: allow mixing idr and non idr slices with frame threading again

This combination exists in the wild
Fixes Ticket3131

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: simplify code setting needs_parsing
Michael Niedermayer [Thu, 27 Feb 2014 12:52:55 +0000 (13:52 +0100)]
avformat/mov: simplify code setting needs_parsing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264_refs: remove lost frames instead of disfavoring them
Michael Niedermayer [Thu, 27 Feb 2014 10:16:23 +0000 (11:16 +0100)]
avcodec/h264_refs: remove lost frames instead of disfavoring them

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 27 Feb 2014 09:34:31 +0000 (10:34 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  af_compand: add a dependency on strtok_r

Conflicts:
configure

Not merged as FFmpegs compand filter does not depend on strtok_r
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264: fix droped frame handling also for threads > 1
Michael Niedermayer [Thu, 27 Feb 2014 02:57:39 +0000 (03:57 +0100)]
avcodec/h264: fix droped frame handling also for threads > 1

Seems i mistakely tested just with threads=1
Fixes part of Ticket3386

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264: avoid using lost frames as references
Michael Niedermayer [Thu, 27 Feb 2014 02:21:07 +0000 (03:21 +0100)]
avcodec/h264: avoid using lost frames as references

Fixes Ticket3386

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi/frei0r: factorize plugin loading with static path
Marton Balint [Sat, 22 Feb 2014 16:46:25 +0000 (17:46 +0100)]
lavfi/frei0r: factorize plugin loading with static path

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agolavfi/frei0r: search plugins in lib64 dirs on all architectures
Marton Balint [Sat, 22 Feb 2014 16:42:20 +0000 (17:42 +0100)]
lavfi/frei0r: search plugins in lib64 dirs on all architectures

As Reimar Döffinger pointed out there are non-x86 64bit architectures as well.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 26 Feb 2014 21:02:19 +0000 (22:02 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: Do not redundantly specifiy H.263-related object files for MSMPEG4v*

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoaf_compand: add a dependency on strtok_r
Anton Khirnov [Wed, 26 Feb 2014 12:44:53 +0000 (13:44 +0100)]
af_compand: add a dependency on strtok_r

5 years agobuild: Do not redundantly specifiy H.263-related object files for MSMPEG4v*
Diego Biurrun [Wed, 19 Feb 2014 19:33:29 +0000 (20:33 +0100)]
build: Do not redundantly specifiy H.263-related object files for MSMPEG4v*

These are already covered through dependencies specified in configure.

5 years agolibavcodec/rawdec: avoid memcpy when performing 16-bit samples shift
Peter Ross [Wed, 26 Feb 2014 10:03:52 +0000 (21:03 +1100)]
libavcodec/rawdec: avoid memcpy when performing 16-bit samples shift

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: use pkg-config to detect libbluray
Timothy Gu [Mon, 24 Feb 2014 00:39:18 +0000 (16:39 -0800)]
configure: use pkg-config to detect libbluray

The current configure fails when static libbluray is compiled with libxml2
support.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/parser: put lost comments back
Michael Niedermayer [Wed, 26 Feb 2014 16:29:18 +0000 (17:29 +0100)]
avcodec/parser: put lost comments back

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/sdr2: h264 stream needs parsing
Paul B Mahol [Wed, 26 Feb 2014 17:46:45 +0000 (17:46 +0000)]
avformat/sdr2: h264 stream needs parsing

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavfilter: remove superflous lines
Paul B Mahol [Wed, 26 Feb 2014 16:34:58 +0000 (16:34 +0000)]
avfilter: remove superflous lines

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavfilter/af_compand: some more cosmetics to decrease difference with qatar
Paul B Mahol [Wed, 26 Feb 2014 15:03:09 +0000 (15:03 +0000)]
avfilter/af_compand: some more cosmetics to decrease difference with qatar

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavfilter: remove af_compand_fork
Michael Niedermayer [Wed, 26 Feb 2014 12:13:50 +0000 (13:13 +0100)]
avfilter: remove af_compand_fork

All relevant changes except the float/double one have been merged

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_compand: more cosmetics from libavfilter/af_compand_fork.c
Michael Niedermayer [Wed, 26 Feb 2014 12:09:30 +0000 (13:09 +0100)]
avfilter/af_compand: more cosmetics from libavfilter/af_compand_fork.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_compand: cosmetics from libavfilter/af_compand_fork.c
Michael Niedermayer [Wed, 26 Feb 2014 11:59:31 +0000 (12:59 +0100)]
avfilter/af_compand: cosmetics from libavfilter/af_compand_fork.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_compand: switch defaults to libavfilter/af_compand_fork.c
Michael Niedermayer [Wed, 26 Feb 2014 11:53:37 +0000 (12:53 +0100)]
avfilter/af_compand: switch defaults to libavfilter/af_compand_fork.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_compand: "use local variable for channels" from libavfilter/af_compand_fork.c
Michael Niedermayer [Wed, 26 Feb 2014 11:50:54 +0000 (12:50 +0100)]
avfilter/af_compand: "use local variable for channels" from libavfilter/af_compand_fork.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_compand: error checks from libavfilter/af_compand_fork.c
Michael Niedermayer [Wed, 26 Feb 2014 11:49:04 +0000 (12:49 +0100)]
avfilter/af_compand: error checks from libavfilter/af_compand_fork.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_compand: pts init code from libavfilter/af_compand_fork.c
Michael Niedermayer [Wed, 26 Feb 2014 11:44:01 +0000 (12:44 +0100)]
avfilter/af_compand: pts init code from libavfilter/af_compand_fork.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_compand: cosmetics and doxy comment from libavfilter/af_compand_fork.c
Michael Niedermayer [Wed, 26 Feb 2014 11:42:47 +0000 (12:42 +0100)]
avfilter/af_compand: cosmetics and doxy comment from libavfilter/af_compand_fork.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_compand: add Andrew Kelley to the copyright
Michael Niedermayer [Wed, 26 Feb 2014 11:40:33 +0000 (12:40 +0100)]
avfilter/af_compand: add Andrew Kelley to the copyright

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_compand: merge avframe code from af_compand_fork
Michael Niedermayer [Wed, 26 Feb 2014 11:29:22 +0000 (12:29 +0100)]
avfilter/af_compand: merge avframe code from af_compand_fork

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_compand: merge uninit() calls on error from af_compand_fork.c
Michael Niedermayer [Wed, 26 Feb 2014 11:11:33 +0000 (12:11 +0100)]
avfilter/af_compand: merge uninit() calls on error from af_compand_fork.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_compand: also support '|' as seperator
Michael Niedermayer [Wed, 26 Feb 2014 11:04:00 +0000 (12:04 +0100)]
avfilter/af_compand: also support '|' as seperator

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_compand_fork: avoid strtok_r() so as not to break build
Michael Niedermayer [Wed, 26 Feb 2014 10:44:42 +0000 (11:44 +0100)]
avfilter/af_compand_fork: avoid strtok_r() so as not to break build

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_compand: whitespace changes from af_compand_fork
Michael Niedermayer [Wed, 26 Feb 2014 10:41:36 +0000 (11:41 +0100)]
avfilter/af_compand: whitespace changes from af_compand_fork

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 26 Feb 2014 10:18:16 +0000 (11:18 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi: add compand audio filter

Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/af_compand.c
libavfilter/allfilters.c
libavfilter/version.h

The filter is added as new one so as to ease clean merging of its changes
in debug-able steps
See: 6b68e2a43b3407522080be50a2a19cff2f9715ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavfi: add compand audio filter
Andrew Kelley [Wed, 26 Feb 2014 06:47:40 +0000 (01:47 -0500)]
lavfi: add compand audio filter

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoRead bits_per_coded_sample from V_MS/VFW/FOURCC mkv files.
Carl Eugen Hoyos [Tue, 25 Feb 2014 23:02:51 +0000 (00:02 +0100)]
Read bits_per_coded_sample from V_MS/VFW/FOURCC mkv files.

Fixes ticket #3425.

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 25 Feb 2014 19:52:37 +0000 (20:52 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  parser: cosmetics: Drop some unnecessary parentheses

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'
Michael Niedermayer [Tue, 25 Feb 2014 18:24:16 +0000 (19:24 +0100)]
Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'

* commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a':
  libavfilter: example audio filtering program

Conflicts:
.gitignore
configure
doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/af_compand: fix invalid read
Andrew Kelley [Tue, 25 Feb 2014 09:37:26 +0000 (04:37 -0500)]
avfilter/af_compand: fix invalid read

Fixes #3383.

5 years agoMerge commit 'a1c699659d56b76c0bf399307f642c6fd6d28281'
Michael Niedermayer [Tue, 25 Feb 2014 18:12:30 +0000 (19:12 +0100)]
Merge commit 'a1c699659d56b76c0bf399307f642c6fd6d28281'

* commit 'a1c699659d56b76c0bf399307f642c6fd6d28281':
  parser: K&R formatting cosmetics

Conflicts:
libavcodec/parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ed61f3ca8a0664a697782253b354055136c5d303'
Michael Niedermayer [Tue, 25 Feb 2014 18:03:29 +0000 (19:03 +0100)]
Merge commit 'ed61f3ca8a0664a697782253b354055136c5d303'

* commit 'ed61f3ca8a0664a697782253b354055136c5d303':
  parser: Remove commented-out cruft

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegvideo: re-indent buffer clearing code
Hendrik Leppkes [Tue, 25 Feb 2014 10:47:28 +0000 (11:47 +0100)]
mpegvideo: re-indent buffer clearing code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegvideo: fix overwriting hwaccel surface objects
Hendrik Leppkes [Tue, 25 Feb 2014 10:47:27 +0000 (11:47 +0100)]
mpegvideo: fix overwriting hwaccel surface objects

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoparser: cosmetics: Drop some unnecessary parentheses
Diego Biurrun [Tue, 25 Feb 2014 11:21:15 +0000 (12:21 +0100)]
parser: cosmetics: Drop some unnecessary parentheses

5 years agolibavfilter: example audio filtering program
Anton Khirnov [Thu, 13 Feb 2014 07:50:16 +0000 (08:50 +0100)]
libavfilter: example audio filtering program

Based on a patch by Andrew Kelley <superjoe30@gmail.com>

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoavcodec/vp8dsp: use AV_ZERO64 to clear idct coefficient rows
Peter Ross [Tue, 25 Feb 2014 10:02:56 +0000 (21:02 +1100)]
avcodec/vp8dsp: use AV_ZERO64 to clear idct coefficient rows

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoparser: K&R formatting cosmetics
Luca Barbato [Sun, 23 Feb 2014 22:59:25 +0000 (23:59 +0100)]
parser: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
5 years agoparser: Remove commented-out cruft
Diego Biurrun [Tue, 25 Feb 2014 10:59:05 +0000 (11:59 +0100)]
parser: Remove commented-out cruft

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 25 Feb 2014 08:02:57 +0000 (09:02 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  texi2pod: always declare the pod file as UTF-8 encoded

Conflicts:
doc/texi2pod.pl

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavu/buffer: add release function
Lukasz Marek [Sun, 23 Feb 2014 22:19:23 +0000 (23:19 +0100)]
lavu/buffer: add release function

new function allows to unref buffer and obtain its data.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg_opt: get_preset_file_2(): fix avio_open2() return code check
Timothy Gu [Mon, 24 Feb 2014 02:19:55 +0000 (02:19 +0000)]
ffmpeg_opt: get_preset_file_2(): fix avio_open2() return  code check

avio_open2() only return < 0 when error.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotexi2pod: always declare the pod file as UTF-8 encoded
Janne Grunau [Mon, 24 Feb 2014 19:22:13 +0000 (20:22 +0100)]
texi2pod: always declare the pod file as UTF-8 encoded

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 24 Feb 2014 21:29:06 +0000 (22:29 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: fix one accented word

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