ffmpeg.git
7 years agoj2kdec: make curtilenum integer.
Michael Niedermayer [Sun, 14 Oct 2012 20:11:38 +0000 (22:11 +0200)]
j2kdec: make curtilenum integer.

This fixes a potential crash.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotag_tree_decode: check node being non null
Michael Niedermayer [Sun, 14 Oct 2012 20:00:04 +0000 (22:00 +0200)]
tag_tree_decode: check node being non null

Fixes CID717843
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocompute_lpc_coefs: assert that normalize and fail have a supported combination
Michael Niedermayer [Sun, 14 Oct 2012 19:53:29 +0000 (21:53 +0200)]
compute_lpc_coefs: assert that normalize and fail have a supported combination

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agonoise_bsf: fix division by 0
Michael Niedermayer [Sun, 14 Oct 2012 19:45:42 +0000 (21:45 +0200)]
noise_bsf: fix division by 0

Fixes CID733737
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoflac_parser.c: fix issue with looping output for small files.
Michael Chinen [Sun, 14 Oct 2012 07:08:43 +0000 (16:08 +0900)]
flac_parser.c: fix issue with looping output for small files.

see trac 1345
https://ffmpeg.org/trac/ffmpeg/ticket/1345

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobgmc: fix sizeof arguments (should fix CIDs: 700724 and 608084)
Thilo Borgmann [Sun, 14 Oct 2012 15:38:21 +0000 (17:38 +0200)]
bgmc: fix sizeof arguments (should fix CIDs: 700724 and 608084)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf: fix fps detection with PAFF H.264
Michael Niedermayer [Sun, 14 Oct 2012 16:53:05 +0000 (18:53 +0200)]
lavf: fix fps detection with PAFF H.264

Fixes Ticket1065
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: fix parsing of old lossless profile (profile_idc == 144)
Hendrik Leppkes [Sun, 14 Oct 2012 08:03:07 +0000 (10:03 +0200)]
h264: fix parsing of old lossless profile (profile_idc == 144)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoeatgq: raise error on unsupported macroblock mode
Peter Ross [Sun, 14 Oct 2012 11:11:42 +0000 (22:11 +1100)]
eatgq: raise error on unsupported macroblock mode

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoansi: by design nb_args may exceed the size of the args array, so guard accordingly
Peter Ross [Sun, 14 Oct 2012 10:50:09 +0000 (21:50 +1100)]
ansi: by design nb_args may exceed the size of the args array, so guard accordingly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 14 Oct 2012 13:11:34 +0000 (15:11 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avutil: Do not make ff_ symbols globally visible.
  avutil: Rename ff_set_systematic_pal2() ---> avpriv_set_systematic_pal2()
  build: tms470: work around glibc math.h problems
  configure: improve tms470 compiler usage with glibc

Conflicts:
libavcodec/bmpenc.c
libavcodec/rawdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoeatgq: fix small overread
Paul B Mahol [Sun, 14 Oct 2012 12:54:10 +0000 (12:54 +0000)]
eatgq: fix small overread

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'
Michael Niedermayer [Sun, 14 Oct 2012 12:38:03 +0000 (14:38 +0200)]
Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520'

* commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520':
  configure: tms470: add mapping for -mfpu=vfpv3-d16 flag
  configure: recognise Minix as OS
  configure: work around bug in ash shell
  eval-test: make table static const
  lavr: handle clipping in the float to s32 conversion
  nut: support pcm codecs not mapped in avi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1bd442c276e6688b43777a198cad0d7e3a92123f'
Michael Niedermayer [Sun, 14 Oct 2012 12:30:06 +0000 (14:30 +0200)]
Merge commit '1bd442c276e6688b43777a198cad0d7e3a92123f'

* commit '1bd442c276e6688b43777a198cad0d7e3a92123f':
  nut: prioritize native tags

Conflicts:
tests/ref/lavfi/crop
tests/ref/lavfi/crop_scale
tests/ref/lavfi/crop_scale_vflip
tests/ref/lavfi/crop_vflip
tests/ref/lavfi/null
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_crop
tests/ref/lavfi/pixfmts_hflip
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_pad
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
tests/ref/lavfi/scale200
tests/ref/lavfi/scale500
tests/ref/lavfi/vflip
tests/ref/lavfi/vflip_crop
tests/ref/lavfi/vflip_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/nut: Clarify what/where is the official nut specification
Michael Niedermayer [Sun, 14 Oct 2012 12:05:41 +0000 (14:05 +0200)]
doc/nut: Clarify what/where is the official nut specification

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowv: do not report invalid stream duration
Paul B Mahol [Sun, 14 Oct 2012 10:37:18 +0000 (10:37 +0000)]
wv: do not report invalid stream duration

If total number of samples is -1 it means stream is of unknown length.

Fixes ticket #1777.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosvq1dec: use log level that have more common sense
Paul B Mahol [Sun, 14 Oct 2012 09:21:48 +0000 (09:21 +0000)]
svq1dec: use log level that have more common sense

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosvq1dec: use more common way to check if result is not zero
Paul B Mahol [Sun, 14 Oct 2012 09:18:36 +0000 (09:18 +0000)]
svq1dec: use more common way to check if result is not zero

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosvq1dec: check return value of get_bits1() in more common way
Paul B Mahol [Sun, 14 Oct 2012 09:14:35 +0000 (09:14 +0000)]
svq1dec: check return value of get_bits1() in more common way

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosvq1dec: return more meaningful error codes
Paul B Mahol [Sun, 14 Oct 2012 09:12:19 +0000 (09:12 +0000)]
svq1dec: return more meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agomp3enc: fix signed C99 overflow
Michael Niedermayer [Sun, 14 Oct 2012 03:49:10 +0000 (05:49 +0200)]
mp3enc: fix signed C99 overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodpxenc: fix signed c99 overflows
Michael Niedermayer [Sun, 14 Oct 2012 03:48:02 +0000 (05:48 +0200)]
dpxenc: fix signed c99 overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: get rid of C99 signed overflows try #2
Michael Niedermayer [Sun, 14 Oct 2012 03:16:59 +0000 (05:16 +0200)]
sws: get rid of C99 signed overflows try #2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopaf: avoid C99 overflows
Michael Niedermayer [Sun, 14 Oct 2012 02:01:41 +0000 (04:01 +0200)]
paf: avoid C99 overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: avoid signed C99 overflows
Michael Niedermayer [Sun, 14 Oct 2012 01:59:45 +0000 (03:59 +0200)]
sws: avoid signed C99 overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswr/rematrix: fix C99 left shift overflow
Michael Niedermayer [Sun, 14 Oct 2012 01:48:05 +0000 (03:48 +0200)]
swr/rematrix: fix C99 left shift overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agog723_1: fix overflow in square_root()
Michael Niedermayer [Sun, 14 Oct 2012 01:42:28 +0000 (03:42 +0200)]
g723_1: fix overflow in square_root()

the intermediate does not fit in a signed 32bit int

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavoid more "0xFF << 24" as it is considered a integer overflow in C99
Michael Niedermayer [Sun, 14 Oct 2012 01:34:16 +0000 (03:34 +0200)]
avoid more "0xFF << 24" as it is considered a integer overflow in C99

missed these in my previous search and replace

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavoid "0xFF << 24" as it is considered a integer overflow in C99
Michael Niedermayer [Sun, 14 Oct 2012 01:17:13 +0000 (03:17 +0200)]
avoid "0xFF << 24" as it is considered a integer overflow in C99

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg4videodec: Recalculate timebase in case of guessing time increment bits
Michael Niedermayer [Sun, 14 Oct 2012 01:02:33 +0000 (03:02 +0200)]
mpeg4videodec: Recalculate timebase in case of guessing time increment bits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/select/scene: use pointer increments instead of y*linesize.
Clément Bœsch [Sun, 14 Oct 2012 00:09:05 +0000 (02:09 +0200)]
lavfi/select/scene: use pointer increments instead of y*linesize.

7 years agolavfi/select/scene: fix potential overread.
Clément Bœsch [Sat, 13 Oct 2012 16:19:29 +0000 (18:19 +0200)]
lavfi/select/scene: fix potential overread.

Also make sure we use the actual width of the image and not the whole
linesize.

7 years agolavfi/select/scene: move out convoluted sad variable init from loop.
Clément Bœsch [Sat, 13 Oct 2012 16:10:28 +0000 (18:10 +0200)]
lavfi/select/scene: move out convoluted sad variable init from loop.

7 years agoalsdec: fix clipping of weightings for MCC decoding
Thilo Borgmann [Sat, 13 Oct 2012 20:58:55 +0000 (22:58 +0200)]
alsdec: fix clipping of weightings for MCC decoding

Fixes CID717905
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegvideo: fix motion_val checks
Michael Niedermayer [Sat, 13 Oct 2012 21:52:55 +0000 (23:52 +0200)]
mpegvideo: fix motion_val checks

Fixes CID604124
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegvideo: check return value of ff_MPV_common_init()
Michael Niedermayer [Sat, 13 Oct 2012 21:48:00 +0000 (23:48 +0200)]
mpegvideo: check return value of ff_MPV_common_init()

Fixes CID703621
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec_find_best_pix_fmt_of_2: fix handling or PIX_FMT_NONE
Michael Niedermayer [Sat, 13 Oct 2012 21:41:10 +0000 (23:41 +0200)]
avcodec_find_best_pix_fmt_of_2: fix handling or PIX_FMT_NONE

Fixes CID733775
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoflashsv: check deflateInit() return value
Michael Niedermayer [Sat, 13 Oct 2012 20:48:32 +0000 (22:48 +0200)]
flashsv: check deflateInit() return value

Fixes CID703620
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodnxhdenc: assert ff_dnxhd_get_cid_table() return value
Michael Niedermayer [Sat, 13 Oct 2012 20:40:14 +0000 (22:40 +0200)]
dnxhdenc: assert ff_dnxhd_get_cid_table() return value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodnxhddata_ Fix mixup of sizeof() and array elements in ff_dnxhd_find_cid()
Michael Niedermayer [Sat, 13 Oct 2012 20:36:15 +0000 (22:36 +0200)]
dnxhddata_ Fix mixup of sizeof() and array elements in ff_dnxhd_find_cid()

Fixes CID717910
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1: make sure gob_count is not 0
Michael Niedermayer [Sat, 13 Oct 2012 20:33:40 +0000 (22:33 +0200)]
ffv1: make sure gob_count is not 0

Fixes division by 0
Fixes CID733736

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws-test: raise limigts a bit.
Michael Niedermayer [Sat, 13 Oct 2012 19:19:52 +0000 (21:19 +0200)]
sws-test: raise limigts a bit.

these cases arent used but theres no point in failing on them

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopp: avoid overflow in w*h
Michael Niedermayer [Sat, 13 Oct 2012 19:09:42 +0000 (21:09 +0200)]
pp: avoid overflow in w*h

Fixes CID700580
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws-test: check W/H
Michael Niedermayer [Sat, 13 Oct 2012 19:05:13 +0000 (21:05 +0200)]
sws-test: check W/H

Fixes CID733834
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/codec_desc: add/update properties of some codecs
Paul B Mahol [Sat, 13 Oct 2012 18:48:48 +0000 (18:48 +0000)]
lavc/codec_desc: add/update properties of some codecs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoffeval: avoid folding EOF onto a valid char
Michael Niedermayer [Sat, 13 Oct 2012 18:10:29 +0000 (20:10 +0200)]
ffeval: avoid folding EOF onto a valid char

Fixes CID733704
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoprobetest: check command line arguments
Michael Niedermayer [Sat, 13 Oct 2012 17:58:44 +0000 (19:58 +0200)]
probetest: check command line arguments

Fixes CID733835
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotrasher: check seek return value.
Michael Niedermayer [Sat, 13 Oct 2012 17:46:53 +0000 (19:46 +0200)]
trasher: check seek return value.

Fixes CID733726
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil: Do not make ff_ symbols globally visible.
Diego Biurrun [Thu, 4 Oct 2012 17:20:03 +0000 (19:20 +0200)]
avutil: Do not make ff_ symbols globally visible.

7 years agoxbmdec: s/av_reverse/ff_reverse
Paul B Mahol [Sat, 13 Oct 2012 18:00:48 +0000 (18:00 +0000)]
xbmdec: s/av_reverse/ff_reverse

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavutil: Rename ff_set_systematic_pal2() ---> avpriv_set_systematic_pal2()
Diego Biurrun [Thu, 4 Oct 2012 19:15:51 +0000 (21:15 +0200)]
avutil: Rename ff_set_systematic_pal2() ---> avpriv_set_systematic_pal2()

Functions used across libraries should have avpriv_ and not ff_ prefixes.

7 years agoconfigure: tms470: add mapping for -mfpu=vfpv3-d16 flag
Mans Rullgard [Sat, 13 Oct 2012 00:34:42 +0000 (01:34 +0100)]
configure: tms470: add mapping for -mfpu=vfpv3-d16 flag

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agobuild: tms470: work around glibc math.h problems
Mans Rullgard [Sat, 13 Oct 2012 02:16:13 +0000 (03:16 +0100)]
build: tms470: work around glibc math.h problems

The glibc definitions of INFINITY and NAN do not work with the
tms470 compiler, nor do our usual fallbacks.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoconfigure: improve tms470 compiler usage with glibc
Mans Rullgard [Sat, 13 Oct 2012 01:28:41 +0000 (02:28 +0100)]
configure: improve tms470 compiler usage with glibc

Apply flags to work around glibc quirks only if glibc is detected,
and add a few more such flags.

Do not mess with as/ld settings in probe_cc.  This is not the
proper place.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agolibavutil: loose idiotic circular dependancies between version and avutil.h
Michael Niedermayer [Sat, 13 Oct 2012 16:16:34 +0000 (18:16 +0200)]
libavutil: loose idiotic circular dependancies between version and avutil.h

This fixes the recently appearing PIX_FMT warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosdp: output speex optional vbr parameter
Dmitry Samonenko [Sat, 13 Oct 2012 15:03:33 +0000 (19:03 +0400)]
sdp: output speex optional vbr parameter

Optional sdp speex payload parameter is outputed only when
data is encoded. It's not printed in case of stream copy.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotests: fix checksums for png aspect ratio change
Michael Niedermayer [Sat, 13 Oct 2012 16:46:42 +0000 (18:46 +0200)]
tests: fix checksums for png aspect ratio change

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: return s->get_buffer() error code if it errors out
Paul B Mahol [Sat, 13 Oct 2012 08:12:50 +0000 (08:12 +0000)]
lavc: return s->get_buffer() error code if it errors out

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agopngenc: write sample aspect ratio
Paul B Mahol [Sat, 13 Oct 2012 09:26:09 +0000 (09:26 +0000)]
pngenc: write sample aspect ratio

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agopngdec: read sample aspect ratio
Paul B Mahol [Sat, 13 Oct 2012 08:38:02 +0000 (08:38 +0000)]
pngdec: read sample aspect ratio

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 13 Oct 2012 15:09:13 +0000 (17:09 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vc1: Use codec ID from AVCodecContext while parsing frame header
  avplay: support mid-stream sample rate changes

Conflicts:
ffplay.c
libavcodec/vc1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: use audio parameters from the decoded frame instead of AVCodecContext
Michael Niedermayer [Sat, 13 Oct 2012 14:45:01 +0000 (16:45 +0200)]
ffplay: use audio parameters from the decoded frame instead of AVCodecContext

Based on commit by Justin Ruggles (the changed code is too different to apply as is)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609'
Michael Niedermayer [Sat, 13 Oct 2012 14:39:42 +0000 (16:39 +0200)]
Merge commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609'

* commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609':
  avplay: use audio parameters from the decoded frame instead of AVCodecContext
  dca: allocate a secondary buffer for extra channels when downmixing
  configure: use utilities from /usr/xpg4/bin if it exists
  avstring-test: fix memory leaks

Conflicts:
ffplay.c
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosmjpegdec: use url_feof()
Paul B Mahol [Sat, 13 Oct 2012 14:09:20 +0000 (14:09 +0000)]
smjpegdec: use url_feof()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723'
Michael Niedermayer [Sat, 13 Oct 2012 13:42:49 +0000 (15:42 +0200)]
Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723'

* commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723':
  rtpdec_xiph: fix function return type
  smjpeg: fix type of 'ret' variable in smjpeg_read_packet()
  mpegvideo: remove write-only variable
  Use proper return values in case of missing features
  fate: add avstring test
  rangecoder-test: Set error message log level to error, instead of debug

Conflicts:
libavcodec/aacdec.c
libavcodec/amrnbdec.c
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '90558e848a29ef1e85ecb1832ad9a26eebe958e0'
Michael Niedermayer [Sat, 13 Oct 2012 13:35:05 +0000 (15:35 +0200)]
Merge commit '90558e848a29ef1e85ecb1832ad9a26eebe958e0'

* commit '90558e848a29ef1e85ecb1832ad9a26eebe958e0':
  rangecoder: K&R formatting cosmetics

Conflicts:
libavcodec/rangecoder.c
libavcodec/rangecoder.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'
Michael Niedermayer [Sat, 13 Oct 2012 13:25:11 +0000 (15:25 +0200)]
Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'

* commit 'ca411fc1d34329cd17b28627f697e391ae52073f':
  avcodec: Remove broken MMI optimizations

Conflicts:
arch.mak
configure
libavcodec/avcodec.h
libavcodec/mips/Makefile
libavcodec/mips/dsputil_mmi.c
libavcodec/mips/idct_mmi.c
libavcodec/mips/mmi.h
libavcodec/mips/mpegvideo_mmi.c
libavcodec/options_table.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: recognise Minix as OS
Mans Rullgard [Fri, 12 Oct 2012 21:42:27 +0000 (21:42 +0000)]
configure: recognise Minix as OS

No special setup is required for Minix.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoconfigure: work around bug in ash shell
Mans Rullgard [Fri, 12 Oct 2012 21:40:07 +0000 (21:40 +0000)]
configure: work around bug in ash shell

The ash 'test' builtin misbehaves if the first operand of a binary
operator looks like a unary operator.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoMerge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'
Michael Niedermayer [Sat, 13 Oct 2012 13:00:13 +0000 (15:00 +0200)]
Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'

* commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be':
  Remove libmpeg2 #define remnants
  De-doxygenize some top-level files

Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_filter.c
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'd5c62122a7b26704bf867a1262df358623bf5edf'
Michael Niedermayer [Sat, 13 Oct 2012 12:35:42 +0000 (14:35 +0200)]
Merge commit 'd5c62122a7b26704bf867a1262df358623bf5edf'

* commit 'd5c62122a7b26704bf867a1262df358623bf5edf':
  Move av_reverse table to libavcodec

Conflicts:
libavcodec/asvenc.c
libavcodec/vble.c
libavutil/common.h
libavutil/mathematics.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066'
Michael Niedermayer [Sat, 13 Oct 2012 12:22:25 +0000 (14:22 +0200)]
Merge commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066'

* commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066':
  avutil: Duplicate ff_log2_tab instead of sharing it across libs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507'
Michael Niedermayer [Sat, 13 Oct 2012 11:57:47 +0000 (13:57 +0200)]
Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507'

* commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507':
  avfilter: call x86 init functions under if (ARCH_X86), not if (HAVE_MMX)
  rtspdec: Set the default port for listen mode, if none is specified
  tscc2: Fix an out of array access
  rtmpproto: Fix an out of array write
  rtspdec: Fix use of uninitialized byte
  vp8: reset loopfilter delta values at keyframes.
  avutil: add yuva422p and yuva444p formats

Conflicts:
libavutil/pixdesc.c
libavutil/pixfmt.h
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovp8dec: reset loopfilter delta values at keyframes
Sami Pietilä [Sat, 13 Oct 2012 10:43:24 +0000 (12:43 +0200)]
vp8dec: reset loopfilter delta values at keyframes

while testing a VP8 encoder I found a mismatch between FFMPEG and libvpx
VP8 decoders. The reason for this mismatch is that FFMPEG doesn't reset
loopfilter delta values at keyframes. Patch that fixes the issue is below.
I've verified that the output of ffmpeg after this patch matches libvpx.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoeval-test: make table static const
Mans Rullgard [Fri, 12 Oct 2012 18:35:11 +0000 (19:35 +0100)]
eval-test: make table static const

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agolavr: handle clipping in the float to s32 conversion
Justin Ruggles [Fri, 12 Oct 2012 19:46:53 +0000 (15:46 -0400)]
lavr: handle clipping in the float to s32 conversion

We cannot clip to INT_MAX because that value cannot be exactly
represented by a float value and ends up overflowing during conversion
anyway. We need to use a slightly smaller float value, which ends up
with slightly inaccurate results for samples which clip or nearly clip,
but it is close enough. Using doubles as intermediates in the conversion
would be more accurate, but it takes about twice as much time.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agonut: prioritize native tags
Luca Barbato [Fri, 12 Oct 2012 13:49:36 +0000 (15:49 +0200)]
nut: prioritize native tags

Use native tags instead of avi ones, simplifies a lot raw video codecs
handling.

7 years agonut: support pcm codecs not mapped in avi
Luca Barbato [Fri, 12 Oct 2012 15:29:43 +0000 (17:29 +0200)]
nut: support pcm codecs not mapped in avi

The native tags will be used when available.

7 years agoAllow autodetection of some dnxhd files that can be decoded correctly.
Carl Eugen Hoyos [Sat, 13 Oct 2012 08:26:06 +0000 (10:26 +0200)]
Allow autodetection of some dnxhd files that can be decoded correctly.

Fixes ticket #1807.

7 years agofate: update pcx reference
Paul B Mahol [Sat, 13 Oct 2012 09:05:28 +0000 (09:05 +0000)]
fate: update pcx reference

It changed because encoder now writes 0/1 for
sample aspect ratio instead of 0/0.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agopcxenc: store sample aspect ratio
Paul B Mahol [Thu, 11 Oct 2012 10:55:33 +0000 (10:55 +0000)]
pcxenc: store sample aspect ratio

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agopcx: read sample aspect ratio
Paul B Mahol [Thu, 11 Oct 2012 10:38:48 +0000 (10:38 +0000)]
pcx: read sample aspect ratio

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agobethsoftvideo: return meaningfull error codes
Paul B Mahol [Sat, 13 Oct 2012 08:05:42 +0000 (08:05 +0000)]
bethsoftvideo: return meaningfull error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agotruemotion2: use more meaningful return codes
Paul B Mahol [Fri, 12 Oct 2012 17:56:57 +0000 (17:56 +0000)]
truemotion2: use more meaningful return codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agovc1: Use codec ID from AVCodecContext while parsing frame header
Mashiat Sarker Shakkhar [Thu, 11 Oct 2012 17:13:56 +0000 (13:13 -0400)]
vc1: Use codec ID from AVCodecContext while parsing frame header

This fixes a segfault with samples that I have (both of them MPEG-TS). Looks like
avctx->codec is not being set during parsing.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
7 years agoavplay: support mid-stream sample rate changes
Justin Ruggles [Sun, 30 Sep 2012 22:18:00 +0000 (18:18 -0400)]
avplay: support mid-stream sample rate changes

Resample to the rate that was configured in SDL.

7 years agoavplay: use audio parameters from the decoded frame instead of AVCodecContext
Justin Ruggles [Mon, 8 Oct 2012 03:55:32 +0000 (23:55 -0400)]
avplay: use audio parameters from the decoded frame instead of AVCodecContext

7 years agodca: allocate a secondary buffer for extra channels when downmixing
Justin Ruggles [Thu, 11 Oct 2012 18:21:56 +0000 (14:21 -0400)]
dca: allocate a secondary buffer for extra channels when downmixing

The output AVFrame buffer only has data for the downmix channels.
Fixes a segfault when decoding dca with request_channels == 2.

7 years agoffserver: fix return value of add_codec()
Michael Niedermayer [Sat, 13 Oct 2012 03:36:41 +0000 (05:36 +0200)]
ffserver: fix return value of add_codec()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpegls: increase run_index to 4
Michael Niedermayer [Sat, 13 Oct 2012 01:49:11 +0000 (03:49 +0200)]
jpegls: increase run_index to 4

Fixes part of CID717913
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpegls: fix off limit
Michael Niedermayer [Sat, 13 Oct 2012 01:49:11 +0000 (03:49 +0200)]
jpegls: fix off limit

Fixes part of CID717913
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorv30_decode_intra_types: make check tighter
Michael Niedermayer [Sat, 13 Oct 2012 01:21:23 +0000 (03:21 +0200)]
rv30_decode_intra_types: make check tighter

This makes no differnce as the affected values cannot occur
But it will likely help static analyzers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoff_celp_lp_synthesis_filterf: change loop end check
Michael Niedermayer [Sat, 13 Oct 2012 01:05:13 +0000 (03:05 +0200)]
ff_celp_lp_synthesis_filterf: change loop end check

This makes no difference for supported input but avoids a
out of array read with input that is never passed in currently

Fixes CID717919
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoff_celp_lp_synthesis_filterf: check that filter_length is within the supported range
Michael Niedermayer [Sat, 13 Oct 2012 01:04:23 +0000 (03:04 +0200)]
ff_celp_lp_synthesis_filterf: check that filter_length is within the supported range

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortpdec_qdm2: change one assert to av_assert0
Michael Niedermayer [Sat, 13 Oct 2012 00:48:07 +0000 (02:48 +0200)]
rtpdec_qdm2: change one assert to av_assert0

Failure of this assert could lead to hard to debug behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowtvdec: fix memleak on error
Michael Niedermayer [Sat, 13 Oct 2012 00:37:47 +0000 (02:37 +0200)]
wtvdec: fix memleak on error

Fixes CID718002
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavio: redesign ffio_rewind_with_probe_data()
Michael Niedermayer [Sat, 13 Oct 2012 00:08:59 +0000 (02:08 +0200)]
avio: redesign ffio_rewind_with_probe_data()

This prevents a double free

Fixes CID718285
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1: avoid checking a double for equality
Michael Niedermayer [Fri, 12 Oct 2012 23:47:31 +0000 (01:47 +0200)]
ffv1: avoid checking a double for equality

if 0.0 != 0.0 a out of array read would occur, equal checks
with floating point may behave in such odd ways, though
this is very unlikely in a real implementation of a compiler

Fixes: CID718936
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaf_pan: fix memleak of arg
Michael Niedermayer [Fri, 12 Oct 2012 23:32:50 +0000 (01:32 +0200)]
af_pan: fix memleak of arg

Fixes CID718988
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_fade: fix memleaks of args
Michael Niedermayer [Fri, 12 Oct 2012 23:08:08 +0000 (01:08 +0200)]
vf_fade: fix memleaks of args

Fixes: CID718989
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>