ffmpeg.git
7 years agoRevert "avutil/x86: disable ff_evaluate_lls_sse2() for 32bit"
Michael Niedermayer [Mon, 1 Jul 2013 00:27:47 +0000 (02:27 +0200)]
Revert "avutil/x86: disable ff_evaluate_lls_sse2() for 32bit"

This reverts commit 247425241cb3b2b76df1c2aced5ce0d56126b82d.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 1 Jul 2013 00:26:15 +0000 (02:26 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: lpc: fix a segfault in av_evaluate_lls_sse2()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovorbisdec: Check VLC tables during use instead of setup
Michael Niedermayer [Mon, 1 Jul 2013 00:09:29 +0000 (02:09 +0200)]
vorbisdec: Check VLC tables during use instead of setup

Fixes regression and Ticket2720

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovorbisdec: propagate errors from setup_classifs()
Michael Niedermayer [Mon, 1 Jul 2013 00:07:26 +0000 (02:07 +0200)]
vorbisdec: propagate errors from setup_classifs()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86: lpc: fix a segfault in av_evaluate_lls_sse2()
Loren Merritt [Sun, 30 Jun 2013 22:56:58 +0000 (22:56 +0000)]
x86: lpc: fix a segfault in av_evaluate_lls_sse2()

7 years agoAvoid a null pointer dereference after oom on frame size change in mpegvideo.c.
Carl Eugen Hoyos [Sun, 30 Jun 2013 21:45:37 +0000 (23:45 +0200)]
Avoid a null pointer dereference after oom on frame size change in mpegvideo.c.

Fixes ticket #2735.

7 years agoAvoid a null pointer dereference on oom in the aac encoder.
Carl Eugen Hoyos [Sun, 30 Jun 2013 21:25:18 +0000 (23:25 +0200)]
Avoid a null pointer dereference on oom in the aac encoder.

Fixes ticket #2732.

7 years agoindeo3: check return values of av_malloc()
Paul B Mahol [Sun, 30 Jun 2013 16:58:13 +0000 (16:58 +0000)]
indeo3: check return values of av_malloc()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sun, 30 Jun 2013 19:18:12 +0000 (21:18 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Support compilation on aix with gcc.
  Rename "AVClass class" as "AVClass component_class".
  Rename constant FRAMESIZE in ra144 codec as FRAME_SIZE.
  Rename thread_init() in libavcodec and libavfilter as library_thread_init().
  Rename constant HZ in af_biquads.c as HERTZ.
  Drop local lable from ppc asm timer.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/x86: disable ff_evaluate_lls_sse2() for 32bit
Michael Niedermayer [Sun, 30 Jun 2013 16:58:06 +0000 (18:58 +0200)]
avutil/x86: disable ff_evaluate_lls_sse2() for 32bit

It just segfaults on 32bit, thus its disabled until someone fixes it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoflac_parser: check return value of av_fifo_alloc()
Paul B Mahol [Sun, 30 Jun 2013 16:49:45 +0000 (16:49 +0000)]
flac_parser: check return value of av_fifo_alloc()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavf/movenc: use ffio_fill()
Matthieu Bouron [Sun, 30 Jun 2013 14:15:44 +0000 (16:15 +0200)]
lavf/movenc: use ffio_fill()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegts: use seek_back() for all seek backs
Michael Niedermayer [Sun, 30 Jun 2013 13:46:04 +0000 (15:46 +0200)]
mpegts: use seek_back() for all seek backs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegts: factor seek_back() out
Michael Niedermayer [Sun, 30 Jun 2013 13:45:23 +0000 (15:45 +0200)]
mpegts: factor seek_back() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegts_read_header: goto fail instead of return directly
Michael Niedermayer [Sun, 30 Jun 2013 13:42:12 +0000 (15:42 +0200)]
mpegts_read_header: goto fail instead of return directly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 30 Jun 2013 12:04:22 +0000 (14:04 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mjpeg: Check the unescaped size for overflows

Conflicts:
libavcodec/mjpegdec.c

See: a9456c7c5ca883b5a3947e59a9fba5587e18e119

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7520d9779c6d30b385df5a0a42da508238076192'
Michael Niedermayer [Sun, 30 Jun 2013 11:50:55 +0000 (13:50 +0200)]
Merge commit '7520d9779c6d30b385df5a0a42da508238076192'

* commit '7520d9779c6d30b385df5a0a42da508238076192':
  mjpeg: Move code out of else branch

Conflicts:
libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoSupport compilation on aix with gcc.
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:47:10 +0000 (13:47 +0200)]
Support compilation on aix with gcc.

Shared libraries and the IBM compiler are currently not supported.
"--arch=ppc" has to be passed to configure, uname is not compatible.

7 years agoRename "AVClass class" as "AVClass component_class".
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:46:27 +0000 (13:46 +0200)]
Rename "AVClass class" as "AVClass component_class".

The aix header math.h defines "extern int class()" for C.

7 years agoRename constant FRAMESIZE in ra144 codec as FRAME_SIZE.
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:45:10 +0000 (13:45 +0200)]
Rename constant FRAMESIZE in ra144 codec as FRAME_SIZE.

The aix header sys/mstsave.h defines FRAMESIZE as _FRAMESIZE.

7 years agoRename thread_init() in libavcodec and libavfilter as library_thread_init().
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:34:46 +0000 (13:34 +0200)]
Rename thread_init() in libavcodec and libavfilter as library_thread_init().

The aix header sys/thread.h contains a definition for thread_init().

7 years agoRename constant HZ in af_biquads.c as HERTZ.
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:32:59 +0000 (13:32 +0200)]
Rename constant HZ in af_biquads.c as HERTZ.

The aix header sys/m_param.h defines HZ as _HZ.

7 years agoDrop local lable from ppc asm timer.
Carl Eugen Hoyos [Sun, 30 Jun 2013 11:31:25 +0000 (13:31 +0200)]
Drop local lable from ppc asm timer.

The aix assembler does not support local lables.

7 years agoMerge commit '7798a59dc14ae27efe64e639a42646002608a908'
Michael Niedermayer [Sun, 30 Jun 2013 11:42:41 +0000 (13:42 +0200)]
Merge commit '7798a59dc14ae27efe64e639a42646002608a908'

* commit '7798a59dc14ae27efe64e639a42646002608a908':
  avconv: Don't include colorspace.h

No change as the commit is already part of ffmpeg.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '02ec656af72030eea4f3d63e30b25625cce6a3df'
Michael Niedermayer [Sun, 30 Jun 2013 11:22:24 +0000 (13:22 +0200)]
Merge commit '02ec656af72030eea4f3d63e30b25625cce6a3df'

* commit '02ec656af72030eea4f3d63e30b25625cce6a3df':
  wmapro: error out on impossible scale factor offsets

The check is replaced by an assert(), as the condition cannot be
true except through bugs elsewhere (which should have been fixed
already)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a'
Michael Niedermayer [Sun, 30 Jun 2013 11:10:33 +0000 (13:10 +0200)]
Merge commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a'

* commit 'd4a217a408da4bd63acc02cd8f9ebe378a2ad65a':
  wmapro: check the min_samples_per_subframe

Conflicts:
libavcodec/wmaprodec.c

See: 9166f483c52e7e0a031a7bb149bea16aaa72f344

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '183880cfc4aae53ce504e13337791cad5841c80c'
Michael Niedermayer [Sun, 30 Jun 2013 10:59:11 +0000 (12:59 +0200)]
Merge commit '183880cfc4aae53ce504e13337791cad5841c80c'

* commit '183880cfc4aae53ce504e13337791cad5841c80c':
  pictor: use the correct logging context

No change, as this has already been fixed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/lpc: Use a function pointer from an initialized context
Michael Niedermayer [Sun, 30 Jun 2013 10:34:50 +0000 (12:34 +0200)]
avcodec/lpc: Use a function pointer from an initialized context

Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'c93ccf5a4cca722b39f05e9f5660b4cb75bc1740'
Michael Niedermayer [Sun, 30 Jun 2013 10:20:12 +0000 (12:20 +0200)]
Merge commit 'c93ccf5a4cca722b39f05e9f5660b4cb75bc1740'

* commit 'c93ccf5a4cca722b39f05e9f5660b4cb75bc1740':
  lpc: use levinson for the first pass of multipass cholesky

Conflicts:
libavcodec/lpc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'b545179fdff1ccfbbb9d422e4e9720cb6c6d9191'
Michael Niedermayer [Sun, 30 Jun 2013 10:15:12 +0000 (12:15 +0200)]
Merge commit 'b545179fdff1ccfbbb9d422e4e9720cb6c6d9191'

* commit 'b545179fdff1ccfbbb9d422e4e9720cb6c6d9191':
  x86: lpc: simd av_evaluate_lls

Conflicts:
libavutil/x86/lls.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolls.asm: disable ff_update_lls_avx
Michael Niedermayer [Sun, 30 Jun 2013 09:59:31 +0000 (11:59 +0200)]
lls.asm: disable ff_update_lls_avx

The code doesnt build with yasm from ubuntu 12.04

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolls.asm: put avx code under if HAVE_AVX_EXTERNAL
Michael Niedermayer [Sun, 30 Jun 2013 09:41:45 +0000 (11:41 +0200)]
lls.asm: put avx code under if HAVE_AVX_EXTERNAL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '502ab21af0ca68f76d6112722c46d2f35c004053'
Michael Niedermayer [Sun, 30 Jun 2013 09:30:07 +0000 (11:30 +0200)]
Merge commit '502ab21af0ca68f76d6112722c46d2f35c004053'

* commit '502ab21af0ca68f76d6112722c46d2f35c004053':
  x86: lpc: simd av_update_lls

The versions are bumped due to changes in lls.h which is used across
libraries affecting intra library ABI
(This version bump also covers changes to lls.h in the immedeatly previous
 commits)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2'
Michael Niedermayer [Sun, 30 Jun 2013 09:22:15 +0000 (11:22 +0200)]
Merge commit '41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2'

* commit '41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2':
  lpc: use function pointers, in preparation for asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'cc6714bb16b1f0716ba43701d47273dbe9657b8b'
Michael Niedermayer [Sun, 30 Jun 2013 08:54:12 +0000 (10:54 +0200)]
Merge commit 'cc6714bb16b1f0716ba43701d47273dbe9657b8b'

* commit 'cc6714bb16b1f0716ba43701d47273dbe9657b8b':
  lpc: remove "decay" argument

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomjpeg: Check the unescaped size for overflows
Luca Barbato [Sat, 29 Jun 2013 04:07:57 +0000 (06:07 +0200)]
mjpeg: Check the unescaped size for overflows

And contextually check init_get_bits success and fix the reporting
message.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agomjpeg: Move code out of else branch
Luca Barbato [Sat, 29 Jun 2013 04:13:53 +0000 (06:13 +0200)]
mjpeg: Move code out of else branch

Simplify the control flow and spare some vertical space.

7 years agoget_xbits: assert validity of the number of bits
Michael Niedermayer [Sat, 29 Jun 2013 22:31:51 +0000 (00:31 +0200)]
get_xbits: assert validity of the number of bits

similar is already done in the other get_bits() functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago4xm: Dont ignore dc run errors
Michael Niedermayer [Sat, 29 Jun 2013 23:29:49 +0000 (01:29 +0200)]
4xm: Dont ignore dc run errors

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago4xm: check for invalid zero ac coeffs
Michael Niedermayer [Sat, 29 Jun 2013 23:28:25 +0000 (01:28 +0200)]
4xm: check for invalid zero ac coeffs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomjpeg_decode_dc: check code before using it in get_xbits()
Michael Niedermayer [Sat, 29 Jun 2013 23:01:24 +0000 (01:01 +0200)]
mjpeg_decode_dc: check code before using it in get_xbits()

Fixes undefined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: Don't include colorspace.h
Derek Buitenhuis [Sat, 29 Jun 2013 18:20:20 +0000 (14:20 -0400)]
ffmpeg: Don't include colorspace.h

The header is private, and ffmpeg.c doesn't use it
for anything.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agoget_pix_fmt_score: favor equal formats if all else equal
Michael Niedermayer [Sat, 29 Jun 2013 20:20:20 +0000 (22:20 +0200)]
get_pix_fmt_score: favor equal formats if all else equal

Fixes Ticket2578

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavconv: Don't include colorspace.h
Derek Buitenhuis [Sat, 29 Jun 2013 18:20:20 +0000 (14:20 -0400)]
avconv: Don't include colorspace.h

The header is private, and avconv.c doesn't use it
for anything.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agoupdate all trac links to use the trac subdomain
Michael Niedermayer [Sat, 29 Jun 2013 17:27:49 +0000 (19:27 +0200)]
update all trac links to use the trac subdomain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sat, 29 Jun 2013 16:27:52 +0000 (18:27 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Avoid a null pointer dereference on clean-up after oom in ac3 encoder.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowmapro: error out on impossible scale factor offsets
Luca Barbato [Sat, 29 Jun 2013 00:16:50 +0000 (02:16 +0200)]
wmapro: error out on impossible scale factor offsets

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agowmapro: check the min_samples_per_subframe
Luca Barbato [Fri, 28 Jun 2013 23:56:09 +0000 (01:56 +0200)]
wmapro: check the min_samples_per_subframe

Must be at least WMAPRO_BLOCK_MIN_SIZE.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agopictor: use the correct logging context
Luca Barbato [Sat, 29 Jun 2013 03:41:58 +0000 (05:41 +0200)]
pictor: use the correct logging context

Broken in 6d97484d72e33f7dde9493a9ead1a72e2f029605

7 years agoAdded codec ID to playback DNxHD
Reuben Martin [Sat, 29 Jun 2013 02:11:53 +0000 (21:11 -0500)]
Added codec ID to playback DNxHD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAvoid a null pointer dereference on clean-up after oom in ac3 encoder.
Carl Eugen Hoyos [Sat, 29 Jun 2013 15:50:07 +0000 (17:50 +0200)]
Avoid a null pointer dereference on clean-up after oom in ac3 encoder.

7 years agoAvoid a null pointer dereference on oom when decoding smacker.
Carl Eugen Hoyos [Sat, 29 Jun 2013 14:04:07 +0000 (16:04 +0200)]
Avoid a null pointer dereference on oom when decoding smacker.

Fixes ticket #2728.

7 years agoPropagate error return values from the smacker decoder.
Carl Eugen Hoyos [Sat, 29 Jun 2013 14:02:43 +0000 (16:02 +0200)]
Propagate error return values from the smacker decoder.

7 years agoAvoid a null pointer dereference on oom when decoding vc1.
Carl Eugen Hoyos [Sat, 29 Jun 2013 12:49:47 +0000 (14:49 +0200)]
Avoid a null pointer dereference on oom when decoding vc1.

Fixes ticket #2723.

7 years agodoc/muxers: apply various minor fixes to segment documentation
Stefano Sabatini [Sat, 29 Jun 2013 12:09:47 +0000 (14:09 +0200)]
doc/muxers: apply various minor fixes to segment documentation

7 years agodoc/muxers: sort muxers by name
Stefano Sabatini [Sat, 29 Jun 2013 11:53:58 +0000 (13:53 +0200)]
doc/muxers: sort muxers by name

7 years agolpc: use levinson for the first pass of multipass cholesky
Loren Merritt [Sun, 16 Jun 2013 00:53:47 +0000 (00:53 +0000)]
lpc: use levinson for the first pass of multipass cholesky

Levinson is faster, and cholesky is only needed if we want to apply different
weights to different samples, which doesn't happen on the first pass.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agox86: lpc: simd av_evaluate_lls
Loren Merritt [Tue, 18 Jun 2013 21:30:43 +0000 (21:30 +0000)]
x86: lpc: simd av_evaluate_lls

1.5x-1.8x faster on sandybridge

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agox86: lpc: simd av_update_lls
Loren Merritt [Tue, 18 Jun 2013 21:30:42 +0000 (21:30 +0000)]
x86: lpc: simd av_update_lls

4x-6x faster on sandybridge

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agolpc: use function pointers, in preparation for asm
Loren Merritt [Tue, 18 Jun 2013 21:30:41 +0000 (21:30 +0000)]
lpc: use function pointers, in preparation for asm

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agolpc: remove "decay" argument
Loren Merritt [Tue, 18 Jun 2013 21:30:40 +0000 (21:30 +0000)]
lpc: remove "decay" argument

We never used the rolling-average mode, and this makes av_update_lls 15% faster.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 29 Jun 2013 10:03:59 +0000 (12:03 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wmapro: check num_vec_coeffs against the actual available buffer

Conflicts:
libavcodec/wmaprodec.c

The check is replaced by an assert.

See: b21ba20cc83c80fe56192fee3626a8087f37d806

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '6652338f43ef623045912d7f28b61adea05d27ae'
Michael Niedermayer [Sat, 29 Jun 2013 09:37:38 +0000 (11:37 +0200)]
Merge commit '6652338f43ef623045912d7f28b61adea05d27ae'

* commit '6652338f43ef623045912d7f28b61adea05d27ae':
  wmapro: return early on unsupported condition

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea'
Michael Niedermayer [Sat, 29 Jun 2013 09:19:37 +0000 (11:19 +0200)]
Merge commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea'

* commit 'e30b068ef79f604ff439418da07f7e2efd01d4ea':
  wmapro: make sure there is room to store the current packet

The check is replaced by an assert as it is impossible to occur
See: 780d45473c32fa356c8ce385c3ea4692567c3228

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'afe03092dd693d025d43e1620283d8d285c92772'
Michael Niedermayer [Sat, 29 Jun 2013 08:58:52 +0000 (10:58 +0200)]
Merge commit 'afe03092dd693d025d43e1620283d8d285c92772'

* commit 'afe03092dd693d025d43e1620283d8d285c92772':
  lavc: move put_bits_left in put_bits.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat: make av_register_*put_format() thread safe
Michael Niedermayer [Sat, 29 Jun 2013 01:44:15 +0000 (03:44 +0200)]
avformat: make av_register_*put_format() thread safe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/bitstream_filter: make av_register_bitstream_filter() thread safe
Michael Niedermayer [Sat, 29 Jun 2013 01:39:03 +0000 (03:39 +0200)]
avcodec/bitstream_filter: make av_register_bitstream_filter() thread safe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/parser: Make av_register_codec_parser() thread safe
Michael Niedermayer [Sat, 29 Jun 2013 01:24:32 +0000 (03:24 +0200)]
avcodec/parser: Make av_register_codec_parser() thread safe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec: Make av_register_hwaccel() and avcodec_register() thread safe
Michael Niedermayer [Sat, 29 Jun 2013 01:11:48 +0000 (03:11 +0200)]
avcodec: Make av_register_hwaccel() and avcodec_register() thread safe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocosmetics: Fix "dont" "wont" "doesnt" typos
Timothy Gu [Sat, 29 Jun 2013 00:24:26 +0000 (17:24 -0700)]
cosmetics: Fix "dont" "wont" "doesnt" typos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoflac_parser.c: fix case when final frame is a false positive
Michael Chinen [Fri, 28 Jun 2013 05:16:39 +0000 (14:16 +0900)]
flac_parser.c: fix case when final frame is a false positive

Should fix https://ffmpeg.org/trac/ffmpeg/ticket/2552
Only did minimal testing on a few files and fate.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoudp: Fix receiving large udp packets
Michael Niedermayer [Fri, 28 Jun 2013 21:58:13 +0000 (23:58 +0200)]
udp: Fix receiving large udp packets

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotak_parser: properly mark packets as key frames
Paul B Mahol [Fri, 28 Jun 2013 21:21:57 +0000 (21:21 +0000)]
tak_parser: properly mark packets as key frames

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoDo not list libshine like a main option in configure's output.
Carl Eugen Hoyos [Fri, 28 Jun 2013 14:23:39 +0000 (16:23 +0200)]
Do not list libshine like a main option in configure's output.

It is listed as an enabled external library if applicable.

7 years agowmapro: check num_vec_coeffs against the actual available buffer
Luca Barbato [Fri, 28 Jun 2013 03:23:21 +0000 (05:23 +0200)]
wmapro: check num_vec_coeffs against the actual available buffer

Prevent yet another buffer overwrite.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agowmapro: return early on unsupported condition
Luca Barbato [Fri, 28 Jun 2013 03:21:33 +0000 (05:21 +0200)]
wmapro: return early on unsupported condition

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agowmapro: make sure there is room to store the current packet
Luca Barbato [Fri, 28 Jun 2013 02:03:47 +0000 (04:03 +0200)]
wmapro: make sure there is room to store the current packet

Prevent horrid and hard to trace struct overwrite.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
7 years agolavc: move put_bits_left in put_bits.h
Luca Barbato [Fri, 28 Jun 2013 01:40:35 +0000 (03:40 +0200)]
lavc: move put_bits_left in put_bits.h

7 years agodoc/decoders: document libopus decoder
Timothy Gu [Fri, 28 Jun 2013 02:07:32 +0000 (19:07 -0700)]
doc/decoders: document libopus decoder

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agodoc/encoders: alphabetically list the encoders
Timothy Gu [Fri, 28 Jun 2013 01:50:54 +0000 (18:50 -0700)]
doc/encoders: alphabetically list the encoders

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agoavfilter/avfilter: Make avfilter_register() thread safe
Michael Niedermayer [Fri, 28 Jun 2013 10:39:26 +0000 (12:39 +0200)]
avfilter/avfilter: Make avfilter_register() thread safe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Fri, 28 Jun 2013 08:14:12 +0000 (10:14 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Avoid a null pointer dereference in avcodec_decode_video2().
  Set block_align when reading QDM2 in mov.
  Fix muxing QDM2 mono into caf.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 28 Jun 2013 08:08:43 +0000 (10:08 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aac: return meaningful errors

Conflicts:
libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '6d8629aac13692447b54eac795bf74007ebf8987'
Michael Niedermayer [Fri, 28 Jun 2013 08:00:51 +0000 (10:00 +0200)]
Merge commit '6d8629aac13692447b54eac795bf74007ebf8987'

* commit '6d8629aac13692447b54eac795bf74007ebf8987':
  aac: K&R formatting cosmetics

Conflicts:
libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAvoid a null pointer dereference in avcodec_decode_video2().
Carl Eugen Hoyos [Thu, 27 Jun 2013 12:03:16 +0000 (14:03 +0200)]
Avoid a null pointer dereference in avcodec_decode_video2().

This could happen if oom occured while probing a file.
Reported in ticket #1900.

7 years agoSet block_align when reading QDM2 in mov.
Carl Eugen Hoyos [Thu, 27 Jun 2013 11:58:30 +0000 (13:58 +0200)]
Set block_align when reading QDM2 in mov.

Fixes ticket #2718.

7 years agoFix muxing QDM2 mono into caf.
Carl Eugen Hoyos [Thu, 27 Jun 2013 09:09:02 +0000 (11:09 +0200)]
Fix muxing QDM2 mono into caf.

7 years agoavfilter/vf_mp: preserve pixel format when possible
Michael Niedermayer [Fri, 28 Jun 2013 01:27:39 +0000 (03:27 +0200)]
avfilter/vf_mp:  preserve pixel format when possible

Fixes Ticket2577

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agogxf: Added codec ID to playback AVCHD
Reuben Martin [Tue, 18 Jun 2013 00:09:34 +0000 (19:09 -0500)]
gxf: Added codec ID to playback AVCHD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/mpegvideo_enc: simplify timestamp checks in load_input_picture()
Stefano Sabatini [Thu, 27 Jun 2013 11:05:41 +0000 (13:05 +0200)]
lavc/mpegvideo_enc: simplify timestamp checks in load_input_picture()

Also improve error feedback while at it.

7 years agoAdded GXF format code to identify AVC Intra video streams. This was an extension...
Reuben Martin [Thu, 13 Jun 2013 03:21:35 +0000 (22:21 -0500)]
Added GXF format code to identify AVC Intra video streams. This was an extension to the origional GXF spec implemented by Grass Valley.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agogxf: Factorize code in get_sindex()
Reuben Martin [Mon, 17 Jun 2013 20:22:46 +0000 (15:22 -0500)]
gxf: Factorize code in get_sindex()

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agogxf: Added GXF format code 25 which is used for DV codec in HD resolutions
Reuben Martin [Mon, 17 Jun 2013 20:22:46 +0000 (15:22 -0500)]
gxf: Added GXF format code 25 which is used for DV codec in HD resolutions

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix copying extradata to codec in mxfdec.c
Nigel Touati-Evans [Thu, 27 Jun 2013 11:28:43 +0000 (12:28 +0100)]
Fix copying extradata to codec in mxfdec.c

The code that copies any extradata from the MXFDescriptor to the codec does
not set the size, which it should otherwise the copied data is useless.
Attached it a patch to correct this.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Thu, 27 Jun 2013 00:01:38 +0000 (02:01 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: simplify and fix flushing out old subtitles on seeking

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaac: return meaningful errors
Luca Barbato [Mon, 6 May 2013 23:29:36 +0000 (01:29 +0200)]
aac: return meaningful errors

7 years agoaac: K&R formatting cosmetics
Luca Barbato [Wed, 26 Jun 2013 23:22:06 +0000 (01:22 +0200)]
aac: K&R formatting cosmetics

7 years agoffprobe: always exit 1 in case of errors
Stefano Sabatini [Wed, 26 Jun 2013 22:13:41 +0000 (00:13 +0200)]
ffprobe: always exit 1 in case of errors

This is consistent with the other ff* tools, and also avoids spurious
success reports when ret%256 = 0.

7 years agoffprobe: reindent after previous commit
Stefano Sabatini [Wed, 26 Jun 2013 22:11:21 +0000 (00:11 +0200)]
ffprobe: reindent after previous commit

7 years agoffprobe: fix exit code with stream specifiers
Nicolas George [Wed, 26 Jun 2013 13:17:27 +0000 (15:17 +0200)]
ffprobe: fix exit code with stream specifiers

Without this fix, ffprobe would exit with a failure exit code if a stream
specifier is given that selects the last stream.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>