ffmpeg.git
6 years agolavf/segment: drop now pointless segment_list_close() function
Stefano Sabatini [Wed, 23 Jan 2013 17:19:42 +0000 (18:19 +0100)]
lavf/segment: drop now pointless segment_list_close() function

6 years agolavf/segment: mark #EXT-X-ENDLIST in M3U8 only at the end of stream
Stefano Sabatini [Tue, 22 Jan 2013 23:23:47 +0000 (00:23 +0100)]
lavf/segment: mark #EXT-X-ENDLIST in M3U8 only at the end of stream

Should fix immediate playback termination.

In particular, should fix trac ticket #2172.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 23 Jan 2013 17:25:53 +0000 (18:25 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpenc: fix overflow checking in avc_mp4_find_startcode()
  rtmp: fix buffer overflows in ff_amf_tag_contents()
  rtmp: fix multiple broken overflow checks
  float_dsp: Include config.h for redefining restrict

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76'
Michael Niedermayer [Wed, 23 Jan 2013 17:15:29 +0000 (18:15 +0100)]
Merge commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76'

* commit 'baf35bb4bc4fe7a2a4113c50989d11dd9ef81e76':
  dsputil: remove one array dimension from avg_no_rnd_pixels_tab.

Conflicts:
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2612c4dc78e1750c4653bf5a9f2cbe95f7b4ed6e'
Michael Niedermayer [Wed, 23 Jan 2013 17:06:50 +0000 (18:06 +0100)]
Merge commit '2612c4dc78e1750c4653bf5a9f2cbe95f7b4ed6e'

* commit '2612c4dc78e1750c4653bf5a9f2cbe95f7b4ed6e':
  dsputil: remove 9/10 bits hpel functions.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2bef1a83d7a3ca60b161ab90bf4d4338e5def5e7'
Michael Niedermayer [Wed, 23 Jan 2013 16:58:39 +0000 (17:58 +0100)]
Merge commit '2bef1a83d7a3ca60b161ab90bf4d4338e5def5e7'

* commit '2bef1a83d7a3ca60b161ab90bf4d4338e5def5e7':
  dsputil: remove some never-assigned function pointers from the struct.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'
Michael Niedermayer [Wed, 23 Jan 2013 16:52:21 +0000 (17:52 +0100)]
Merge commit '32ff6432284f713e9f837ee5b36fc8e9f1902836'

* commit '32ff6432284f713e9f837ee5b36fc8e9f1902836':
  dsputil: remove avg_no_rnd_pixels8.

Conflicts:
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'
Michael Niedermayer [Wed, 23 Jan 2013 16:44:56 +0000 (17:44 +0100)]
Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f':
  Drop DCTELEM typedef

Conflicts:
libavcodec/alpha/dsputil_alpha.h
libavcodec/alpha/motion_est_alpha.c
libavcodec/arm/dsputil_init_armv6.c
libavcodec/bfin/dsputil_bfin.h
libavcodec/bfin/pixels_bfin.S
libavcodec/cavs.c
libavcodec/cavsdec.c
libavcodec/dct-test.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/eamad.c
libavcodec/h264_cavlc.c
libavcodec/h264idct_template.c
libavcodec/mpeg12.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/ppc/dsputil_altivec.c
libavcodec/proresdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/swapuv: support all planar yuv pixel formats
Paul B Mahol [Sat, 22 Dec 2012 01:48:17 +0000 (01:48 +0000)]
lavfi/swapuv: support all planar yuv pixel formats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge commit '2e4bb99f4df7052b3e147ee898fcb4013a34d904'
Michael Niedermayer [Wed, 23 Jan 2013 15:59:33 +0000 (16:59 +0100)]
Merge commit '2e4bb99f4df7052b3e147ee898fcb4013a34d904'

* commit '2e4bb99f4df7052b3e147ee898fcb4013a34d904':
  vorbisdsp: convert x86 simd functions from inline asm to yasm.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a'
Michael Niedermayer [Wed, 23 Jan 2013 15:52:05 +0000 (16:52 +0100)]
Merge commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a'

* commit '0ee8293a77a6afad161e91ce1d43c4a57ce33a6a':
  vp3dsp: don't do aligned reads on input.
  mlp_parser: cosmetics: re-indent.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomlpdec: remove disabled code, leftover from merge
Michael Niedermayer [Wed, 23 Jan 2013 15:50:52 +0000 (16:50 +0100)]
mlpdec: remove disabled code, leftover from merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ed1b01131e662c9086b27aaaea69684d8575fbea'
Michael Niedermayer [Wed, 23 Jan 2013 15:44:30 +0000 (16:44 +0100)]
Merge commit 'ed1b01131e662c9086b27aaaea69684d8575fbea'

* commit 'ed1b01131e662c9086b27aaaea69684d8575fbea':
  mlp: implement support for AVCodecContext.request_channel_layout.

Conflicts:
libavcodec/mlpdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b0c7e3ffd09f68022429920da483ad7abed84aa1'
Michael Niedermayer [Wed, 23 Jan 2013 15:34:34 +0000 (16:34 +0100)]
Merge commit 'b0c7e3ffd09f68022429920da483ad7abed84aa1'

* commit 'b0c7e3ffd09f68022429920da483ad7abed84aa1':
  mlp_parser: account for AVCodecContext.request_channels when setting the channel layout.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb'
Michael Niedermayer [Wed, 23 Jan 2013 15:12:05 +0000 (16:12 +0100)]
Merge commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb'

* commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb':
  mlpdec: set the channel layout.

Conflicts:
libavcodec/mlpdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3ffcccb4fbaae4d5ad775506f1f2761f2029affa'
Michael Niedermayer [Wed, 23 Jan 2013 14:59:45 +0000 (15:59 +0100)]
Merge commit '3ffcccb4fbaae4d5ad775506f1f2761f2029affa'

* commit '3ffcccb4fbaae4d5ad775506f1f2761f2029affa':
  mlpdec: TrueHD: use Libav channel order.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '99ccd2ba10eac2b282c272ad9e75f082123c765a'
Michael Niedermayer [Wed, 23 Jan 2013 13:54:40 +0000 (14:54 +0100)]
Merge commit '99ccd2ba10eac2b282c272ad9e75f082123c765a'

* commit '99ccd2ba10eac2b282c272ad9e75f082123c765a':
  mlp: store the channel layout for each substream.

Conflicts:
libavcodec/mlp_parser.c
libavcodec/mlpdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '73b704ac609d83e0be124589f24efd9b94947cf9'
Michael Niedermayer [Wed, 23 Jan 2013 13:31:55 +0000 (14:31 +0100)]
Merge commit '73b704ac609d83e0be124589f24efd9b94947cf9'

* commit '73b704ac609d83e0be124589f24efd9b94947cf9':
  arm: Add some missing header #includes
  floatdsp: move scalarproduct_float from dsputil to avfloatdsp.

Conflicts:
libavcodec/acelp_pitch_delay.c
libavcodec/amrnbdec.c
libavcodec/amrwbdec.c
libavcodec/ra288.c
libavcodec/x86/dsputil_mmx.c
libavutil/x86/float_dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5959bfaca396ecaf63a8123055f499688b79cae3'
Michael Niedermayer [Wed, 23 Jan 2013 13:13:54 +0000 (14:13 +0100)]
Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3'

* commit '5959bfaca396ecaf63a8123055f499688b79cae3':
  floatdsp: move butterflies_float from dsputil to avfloatdsp.

Conflicts:
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/imc.c
libavcodec/mpegaudiodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'
Michael Niedermayer [Wed, 23 Jan 2013 13:04:50 +0000 (14:04 +0100)]
Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'

* commit '42d324694883cdf1fff1612ac70fa403692a1ad4':
  floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.

Conflicts:
libavcodec/arm/dsputil_init_vfp.c
libavcodec/arm/dsputil_vfp.S
libavcodec/dsputil.c
libavcodec/ppc/float_altivec.c
libavcodec/x86/dsputil.asm
libavutil/x86/float_dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '55aa03b9f8f11ebb7535424cc0e5635558590f49'
Michael Niedermayer [Wed, 23 Jan 2013 12:54:34 +0000 (13:54 +0100)]
Merge commit '55aa03b9f8f11ebb7535424cc0e5635558590f49'

* commit '55aa03b9f8f11ebb7535424cc0e5635558590f49':
  floatdsp: move vector_fmul_add from dsputil to avfloatdsp.

Conflicts:
libavcodec/dsputil.c
libavcodec/x86/dsputil.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortpenc: fix overflow checking in avc_mp4_find_startcode()
Xi Wang [Wed, 23 Jan 2013 01:58:07 +0000 (20:58 -0500)]
rtpenc: fix overflow checking in avc_mp4_find_startcode()

The check `start + res < start' is broken since pointer overflow is
undefined behavior in C.  Many compilers such as gcc/clang optimize
away this check.

Use `res > end - start' instead.  Also change `res' to unsigned int
to avoid signed left-shift overflow.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortmp: fix buffer overflows in ff_amf_tag_contents()
Xi Wang [Wed, 23 Jan 2013 02:40:05 +0000 (21:40 -0500)]
rtmp: fix buffer overflows in ff_amf_tag_contents()

A negative `size' will bypass FFMIN().  In the subsequent memcpy() call,
`size' will be considered as a large positive value, leading to a buffer
overflow.

Change the type of `size' to unsigned int to avoid buffer overflow, and
simplify overflow checks accordingly. Also change a literal buffer
size to use sizeof, and limit the amount of data copied in another
memcpy call as well.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortmp: fix multiple broken overflow checks
Xi Wang [Tue, 22 Jan 2013 22:49:29 +0000 (17:49 -0500)]
rtmp: fix multiple broken overflow checks

Sanity checks like `data + size >= data_end || data + size < data' are
broken, because `data + size < data' assumes pointer overflow, which is
undefined behavior in C.  Many compilers such as gcc/clang optimize such
checks away.

Use `size < 0 || size >= data_end - data' instead.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoadcpmenc: remove unused header
Paul B Mahol [Tue, 22 Jan 2013 20:37:42 +0000 (20:37 +0000)]
adcpmenc: remove unused header

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agojpeglsenc: add missing put_bits.h header
Paul B Mahol [Tue, 22 Jan 2013 20:35:04 +0000 (20:35 +0000)]
jpeglsenc: add missing put_bits.h header

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoffv1enc: include correct header
Paul B Mahol [Tue, 22 Jan 2013 20:32:44 +0000 (20:32 +0000)]
ffv1enc: include correct header

Encoder needs put_bits.h, not get_bits.h

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodcaenc: remove unused header
Paul B Mahol [Tue, 22 Jan 2013 20:31:14 +0000 (20:31 +0000)]
dcaenc: remove unused header

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoflacenc: include correct header
Paul B Mahol [Tue, 22 Jan 2013 20:27:01 +0000 (20:27 +0000)]
flacenc: include correct header

Encoder needs put_bits.h, not get_bits.h

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agofloat_dsp: Include config.h for redefining restrict
Martin Storsjö [Wed, 23 Jan 2013 09:03:49 +0000 (11:03 +0200)]
float_dsp: Include config.h for redefining restrict

This makes sure that the restrict keyword is mapped to whatever
keyword the compiler prefers/supports. This fixes building on MSVC
(and possibly on GCC 2.x as well).

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortmp: fix buffer overflows in ff_amf_tag_contents()
Xi Wang [Wed, 23 Jan 2013 02:40:05 +0000 (21:40 -0500)]
rtmp: fix buffer overflows in ff_amf_tag_contents()

A negative `size' will bypass FFMIN().  In the subsequent memcpy() call,
`size' will be considered as a large positive value, leading to a buffer
overflow.

Change the type of `size' to unsigned int to avoid buffer overflow, and
simplify overflow checks accordingly.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortmp: fix multiple broken overflow checks
Xi Wang [Tue, 22 Jan 2013 22:49:29 +0000 (17:49 -0500)]
rtmp: fix multiple broken overflow checks

Sanity checks like `data + size >= data_end || data + size < data' are
broken, because `data + size < data' assumes pointer overflow, which is
undefined behavior in C.  Many compilers such as gcc/clang optimize such
checks away.

Use `size < 0 || size >= data_end - data' instead.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortpenc: fix overflow checking in avc_mp4_find_startcode()
Xi Wang [Wed, 23 Jan 2013 01:58:07 +0000 (20:58 -0500)]
rtpenc: fix overflow checking in avc_mp4_find_startcode()

The check `start + res < start' is broken since pointer overflow is
undefined behavior in C.  Many compilers such as gcc/clang optimize
away this check.

Use `res > end - start' instead.  Also change `res' to unsigned int
to avoid signed left-shift overflow.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotruemotion2: use av_mallocz()
Michael Niedermayer [Wed, 23 Jan 2013 04:09:43 +0000 (05:09 +0100)]
truemotion2: use av_mallocz()

Fixes use of uninitialized values.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotruemotion2: clear the token array if its initialization fails.
Michael Niedermayer [Wed, 23 Jan 2013 03:41:41 +0000 (04:41 +0100)]
truemotion2: clear the token array if its initialization fails.

Fixes use of uninitialized and half initialized values, which
can occur on several error pathes

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodsputil: remove one array dimension from avg_no_rnd_pixels_tab.
Ronald S. Bultje [Tue, 22 Jan 2013 19:27:57 +0000 (11:27 -0800)]
dsputil: remove one array dimension from avg_no_rnd_pixels_tab.

6 years agodsputil: remove 9/10 bits hpel functions.
Ronald S. Bultje [Tue, 22 Jan 2013 19:00:35 +0000 (11:00 -0800)]
dsputil: remove 9/10 bits hpel functions.

These are never used.

6 years agodsputil: remove some never-assigned function pointers from the struct.
Ronald S. Bultje [Tue, 22 Jan 2013 02:51:52 +0000 (18:51 -0800)]
dsputil: remove some never-assigned function pointers from the struct.

6 years agodsputil: remove avg_no_rnd_pixels8.
Ronald S. Bultje [Tue, 22 Jan 2013 02:02:30 +0000 (18:02 -0800)]
dsputil: remove avg_no_rnd_pixels8.

This is never used.

6 years agoDrop DCTELEM typedef
Diego Biurrun [Sun, 20 Jan 2013 00:02:29 +0000 (01:02 +0100)]
Drop DCTELEM typedef

It does not help as an abstraction and adds dsputil dependencies.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
6 years agovorbisdsp: convert x86 simd functions from inline asm to yasm.
Ronald S. Bultje [Wed, 16 Jan 2013 01:00:41 +0000 (17:00 -0800)]
vorbisdsp: convert x86 simd functions from inline asm to yasm.

6 years agovp3dsp: don't do aligned reads on input.
Ronald S. Bultje [Tue, 22 Jan 2013 20:45:35 +0000 (12:45 -0800)]
vp3dsp: don't do aligned reads on input.

The input is not guaranteed to be aligned.

6 years agomvdec: check channel count.
Michael Niedermayer [Tue, 22 Jan 2013 22:05:53 +0000 (23:05 +0100)]
mvdec: check channel count.

Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomvdec: minor simplification, remove av_inv_q()
Michael Niedermayer [Tue, 22 Jan 2013 21:52:23 +0000 (22:52 +0100)]
mvdec: minor simplification, remove av_inv_q()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomvdec: use avpriv_set_pts_info() instead of directly setting tb.
Michael Niedermayer [Tue, 22 Jan 2013 21:40:38 +0000 (22:40 +0100)]
mvdec: use avpriv_set_pts_info() instead of directly setting tb.

Fixes division by 0

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosanm: remove "duplicate" for loop.
Michael Niedermayer [Tue, 22 Jan 2013 21:28:41 +0000 (22:28 +0100)]
sanm: remove "duplicate" for loop.

Fixes input buffer overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomlp: implement support for AVCodecContext.request_channel_layout.
Tim Walker [Mon, 31 Dec 2012 14:33:27 +0000 (15:33 +0100)]
mlp: implement support for AVCodecContext.request_channel_layout.

Also wrap usage of AVCodecContext.request_channels in FF_API_REQUEST_CHANNELS directives.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 years agomlp_parser: account for AVCodecContext.request_channels when setting the channel...
Tim Walker [Mon, 31 Dec 2012 14:33:26 +0000 (15:33 +0100)]
mlp_parser: account for AVCodecContext.request_channels when setting the channel layout.

Allows users to configure the output based on what's actually decoded, rather than the full native layout.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 years agomlpdec: set the channel layout.
Tim Walker [Mon, 31 Dec 2012 14:33:25 +0000 (15:33 +0100)]
mlpdec: set the channel layout.

Fixes bug 401.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org

6 years agomlpdec: TrueHD: use Libav channel order.
Tim Walker [Mon, 31 Dec 2012 14:33:24 +0000 (15:33 +0100)]
mlpdec: TrueHD: use Libav channel order.

Fixes bug 208.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org

6 years agomlp: store the channel layout for each substream.
Tim Walker [Mon, 31 Dec 2012 14:33:23 +0000 (15:33 +0100)]
mlp: store the channel layout for each substream.

Also stop storing the channel arrangement in the header info, as it's unused outside of ff_mlp_read_major_sync.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org

6 years agomlp_parser: cosmetics: re-indent.
Tim Walker [Mon, 31 Dec 2012 14:33:28 +0000 (15:33 +0100)]
mlp_parser: cosmetics: re-indent.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 years agosanm: check image dimensions before using them
Michael Niedermayer [Tue, 22 Jan 2013 20:30:20 +0000 (21:30 +0100)]
sanm: check image dimensions before using them

Avoids integer overflows and out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoarm: Add some missing header #includes
Diego Biurrun [Mon, 21 Jan 2013 09:16:02 +0000 (10:16 +0100)]
arm: Add some missing header #includes

6 years agofloatdsp: move butterflies_float from dsputil to avfloatdsp.
Ronald S. Bultje [Sun, 20 Jan 2013 23:41:14 +0000 (15:41 -0800)]
floatdsp: move butterflies_float from dsputil to avfloatdsp.

This makes wmadec/enc, twinvq and mpegaudiodec (i.e. mp2/mp3)
independent of dsputil.

6 years agofloatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.
Ronald S. Bultje [Sun, 20 Jan 2013 21:20:30 +0000 (13:20 -0800)]
floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.

Now, nellymoserenc and aacenc no longer depends on dsputil. Independent
of this patch, wmaprodec also does not depend on dsputil, so I removed
it from there also.

6 years agofloatdsp: move vector_fmul_add from dsputil to avfloatdsp.
Ronald S. Bultje [Sun, 20 Jan 2013 06:26:58 +0000 (22:26 -0800)]
floatdsp: move vector_fmul_add from dsputil to avfloatdsp.

6 years agofloatdsp: move scalarproduct_float from dsputil to avfloatdsp.
Ronald S. Bultje [Sun, 20 Jan 2013 23:41:52 +0000 (15:41 -0800)]
floatdsp: move scalarproduct_float from dsputil to avfloatdsp.

This makes the aac decoder and all voice codecs independent of dsputil.

6 years agolagarith: return more meaningful error codes
Paul B Mahol [Tue, 22 Jan 2013 19:48:23 +0000 (19:48 +0000)]
lagarith: return more meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/showwaves: fix check on showwaves->outpicref
Stefano Sabatini [Tue, 22 Jan 2013 11:18:52 +0000 (12:18 +0100)]
lavfi/showwaves: fix check on showwaves->outpicref

outpicref is not always in synch with showwaves->outpicref, which is
changed as a side effect of the call to functions.

Fix regression introduced in 5f634480d1c4ed7711a15d1be07e49177cf351c1,
+10l to me.

6 years agoFix compilation with --disable-everything --enable-demuxer=loas
Carl Eugen Hoyos [Tue, 22 Jan 2013 19:26:10 +0000 (20:26 +0100)]
Fix compilation with --disable-everything --enable-demuxer=loas

6 years agolavf/aiffenc: ID3 tags support
Matthieu Bouron [Fri, 4 Jan 2013 20:19:40 +0000 (21:19 +0100)]
lavf/aiffenc: ID3 tags support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/segment: provide link to HTML M3U8 draft, also fix mentioned version in docs
Stefano Sabatini [Tue, 22 Jan 2013 19:17:00 +0000 (20:17 +0100)]
lavf/segment: provide link to HTML M3U8 draft, also fix mentioned version in docs

6 years agodoc/muxers: remove outdated comment about live flags for the segment muxer
Stefano Sabatini [Tue, 22 Jan 2013 19:12:59 +0000 (20:12 +0100)]
doc/muxers: remove outdated comment about live flags for the segment muxer

The live flags is currently unused, but still kept for backward
compatibility reasons (and in case it turns to be useful again for
whatever reason).

6 years agoSupport solid gray frames when decoding Lagarith.
Carl Eugen Hoyos [Tue, 22 Jan 2013 19:17:53 +0000 (20:17 +0100)]
Support solid gray frames when decoding Lagarith.

Fixes bug 431.

6 years agolibm: Add fallback definition for cbrt() using pow()
James Almer [Tue, 22 Jan 2013 07:10:21 +0000 (04:10 -0300)]
libm: Add fallback definition for cbrt() using pow()

The function is known to be missing in at least one target (MSVC).

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 22 Jan 2013 13:54:06 +0000 (14:54 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  proresdec: support mixed interlaced/non-interlaced content
  vp3/5: move put_no_rnd_pixels_l2 from dsputil to VP3DSPContext.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortpenc: do not use random values for seq when bitexact is requested.
Michael Niedermayer [Tue, 22 Jan 2013 13:40:18 +0000 (14:40 +0100)]
rtpenc: do not use random values for seq when bitexact is requested.

Fixes fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4f56e773fe8a554b8c2662650aaf799c2ece2721'
Michael Niedermayer [Tue, 22 Jan 2013 13:27:48 +0000 (14:27 +0100)]
Merge commit '4f56e773fe8a554b8c2662650aaf799c2ece2721'

* commit '4f56e773fe8a554b8c2662650aaf799c2ece2721':
  x86: ac3: Fix HAVE_MMXEXT condition to only refer to external assembly
  rtpenc: Start the sequence numbers from a random offset

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6'
Michael Niedermayer [Tue, 22 Jan 2013 12:59:13 +0000 (13:59 +0100)]
Merge commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6'

* commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6':
  Revert "fate: Use wmv2 IDCT for wmv2 tests"

Conflicts:
tests/fate-run.sh
tests/fate/vcodec.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4af5310d29379283553bcd9f541a3f6c317f706e'
Michael Niedermayer [Tue, 22 Jan 2013 12:49:45 +0000 (13:49 +0100)]
Merge commit '4af5310d29379283553bcd9f541a3f6c317f706e'

* commit '4af5310d29379283553bcd9f541a3f6c317f706e':
  get_bits/put_bits: K&R formatting cosmetics

Conflicts:
libavcodec/get_bits.h
libavcodec/put_bits.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '570a4a0189946c2c983da41d37fdd67fa13266e7'
Michael Niedermayer [Tue, 22 Jan 2013 12:38:20 +0000 (13:38 +0100)]
Merge commit '570a4a0189946c2c983da41d37fdd67fa13266e7'

* commit '570a4a0189946c2c983da41d37fdd67fa13266e7':
  avidec: use sensible error codes instead of -1

Conflicts:
libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoproresdec: support mixed interlaced/non-interlaced content
Michael Smith [Mon, 21 Jan 2013 18:40:35 +0000 (19:40 +0100)]
proresdec: support mixed interlaced/non-interlaced content

Set interlaced to false if we don't have an interlaced frame

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agomov: prevent double free if the caller replaces the io context.
Michael Niedermayer [Tue, 22 Jan 2013 04:15:47 +0000 (05:15 +0100)]
mov: prevent double free if the caller replaces the io context.

Fixes Ticket2148

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/x86/cabac: workaround llvm 4.2.1 bug
Michael Niedermayer [Tue, 22 Jan 2013 02:13:51 +0000 (03:13 +0100)]
avcodec/x86/cabac: workaround llvm 4.2.1 bug

x86_64 is affected by this too
Fixes Ticket2156

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp3/5: move put_no_rnd_pixels_l2 from dsputil to VP3DSPContext.
Ronald S. Bultje [Mon, 21 Jan 2013 19:02:33 +0000 (11:02 -0800)]
vp3/5: move put_no_rnd_pixels_l2 from dsputil to VP3DSPContext.

The function is only used in VP3 and VP5, so no need to have it in
DSPContext.

6 years agodoc: document aresample:first_pts
Michael Niedermayer [Mon, 21 Jan 2013 15:47:34 +0000 (16:47 +0100)]
doc: document aresample:first_pts

Documentation copied from asyncts, the options are supposed to do
the same thing. If not please submit a testcase where they differ
so we can fix it.

Disscussed-with: saste on IRC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: ac3: Fix HAVE_MMXEXT condition to only refer to external assembly
Diego Biurrun [Mon, 21 Jan 2013 18:43:06 +0000 (19:43 +0100)]
x86: ac3: Fix HAVE_MMXEXT condition to only refer to external assembly

CC: libav-stable@libav.org
6 years agortpenc: Start the sequence numbers from a random offset
Martin Storsjö [Fri, 7 Dec 2012 09:12:28 +0000 (11:12 +0200)]
rtpenc: Start the sequence numbers from a random offset

Expose the current sequence number via an AVOption - this can
be used both for setting the initial sequence number, or for
querying the current number.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavf_showwaves: fix null pointer dereference
Michael Niedermayer [Mon, 21 Jan 2013 22:00:20 +0000 (23:00 +0100)]
avf_showwaves: fix null pointer dereference

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/swr: More verbose description of the force resample flag.
Michael Niedermayer [Mon, 21 Jan 2013 21:45:58 +0000 (22:45 +0100)]
doc/swr: More verbose description of the force resample flag.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/swr: elaborate on what the LFE mix level is.
Michael Niedermayer [Mon, 21 Jan 2013 20:48:34 +0000 (21:48 +0100)]
doc/swr: elaborate on what the LFE mix level is.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/swr: typo fix
Michael Niedermayer [Mon, 21 Jan 2013 20:46:48 +0000 (21:46 +0100)]
doc/swr: typo fix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/swr: docu lfe mix level unit & range
Michael Niedermayer [Mon, 21 Jan 2013 20:44:39 +0000 (21:44 +0100)]
doc/swr: docu lfe mix level unit & range

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/swr: try to fix non english "inclusively included between"
Michael Niedermayer [Mon, 21 Jan 2013 20:41:07 +0000 (21:41 +0100)]
doc/swr: try to fix non english "inclusively included between"

Googling this term has 9 hits, 7 from ffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/swr: Mention that the internal sample format is choosen automatically if not set
Michael Niedermayer [Mon, 21 Jan 2013 20:16:43 +0000 (21:16 +0100)]
doc/swr: Mention that the internal sample format is choosen automatically if not set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodocs/swr: better used_channel_count docs
Michael Niedermayer [Mon, 21 Jan 2013 20:14:27 +0000 (21:14 +0100)]
docs/swr: better used_channel_count docs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoimg2dec: support seeking in infinitely looped stream
Michael Niedermayer [Tue, 8 Jan 2013 21:02:08 +0000 (22:02 +0100)]
img2dec: support seeking in infinitely looped stream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRevert "fate: Use wmv2 IDCT for wmv2 tests"
Luca Barbato [Mon, 21 Jan 2013 18:43:53 +0000 (19:43 +0100)]
Revert "fate: Use wmv2 IDCT for wmv2 tests"

This reverts commit ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3.

6 years agodoc/muxers: extend and clarify documentation for the segment muxer time options
Stefano Sabatini [Fri, 18 Jan 2013 23:50:40 +0000 (00:50 +0100)]
doc/muxers: extend and clarify documentation for the segment muxer time options

6 years agolavf/hlsenc: append last incomplete segment when closing the output
Stefano Sabatini [Sun, 13 Jan 2013 16:22:59 +0000 (17:22 +0100)]
lavf/hlsenc: append last incomplete segment when closing the output

Also introduce missing check on PTS value in case of NOPTS value.

6 years agodsputil: CONFIG_DWT doesnt exist anymore
Michael Niedermayer [Mon, 21 Jan 2013 18:09:16 +0000 (19:09 +0100)]
dsputil: CONFIG_DWT doesnt exist anymore

place snow dwt init under correct checks
should fix compilation with enable-random

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp3: fix compilation with a disabled theora
Michael Niedermayer [Mon, 21 Jan 2013 18:04:34 +0000 (19:04 +0100)]
vp3: fix compilation with a disabled theora

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoget_bits/put_bits: K&R formatting cosmetics
Diego Biurrun [Sun, 20 Jan 2013 15:10:24 +0000 (16:10 +0100)]
get_bits/put_bits: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agooggdec: remove unused variables
Michael Niedermayer [Mon, 21 Jan 2013 15:41:50 +0000 (16:41 +0100)]
oggdec: remove unused variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 21 Jan 2013 15:34:24 +0000 (16:34 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsputilenc: x86: Convert pixel inline asm to yasm
  libgsm: detect libgsm header path

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3'
Michael Niedermayer [Mon, 21 Jan 2013 15:28:04 +0000 (16:28 +0100)]
Merge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3'

* commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3':
  fate: Use wmv2 IDCT for wmv2 tests
  vorbisdsp: change block_size type from int to intptr_t.

Conflicts:
tests/fate-run.sh
tests/fate/vcodec.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoafade filter
Paul B Mahol [Thu, 17 Jan 2013 21:53:27 +0000 (21:53 +0000)]
afade filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge commit '93af2734ee609133eaeca28329d7f13241dd411f'
Michael Niedermayer [Mon, 21 Jan 2013 15:14:41 +0000 (16:14 +0100)]
Merge commit '93af2734ee609133eaeca28329d7f13241dd411f'

* commit '93af2734ee609133eaeca28329d7f13241dd411f':
  lavc: put FF_IDCT_{VP3,H264,CAVS,BINK,EA,WMV2} under FF_API_IDCT.

Conflicts:
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0'
Michael Niedermayer [Mon, 21 Jan 2013 14:34:57 +0000 (15:34 +0100)]
Merge commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0'

* commit 'e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0':
  wmv2: move IDCT to its own DSP context.

Conflicts:
libavcodec/dsputil.h
tests/ref/seek/vsynth2-wmv2
tests/ref/vsynth/vsynth1-wmv2
tests/ref/vsynth/vsynth2-wmv2

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