ffmpeg.git
7 years agoMerge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d'
Michael Niedermayer [Tue, 16 Oct 2012 11:57:10 +0000 (13:57 +0200)]
Merge commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d'

* commit 'c1fcfdec75468009dc7de29a5d1c6adf3b2ef77d':
  rangecoder-test: Return in case of an error
  build: simplify enabling of compat objects

Conflicts:
configure
libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotools/ffeval: do not use UNIX-specific /dev/std{in,out} files
Stefano Sabatini [Mon, 15 Oct 2012 19:53:35 +0000 (21:53 +0200)]
tools/ffeval: do not use UNIX-specific /dev/std{in,out} files

Should fix behavior when the /dev/ directory is not defined (e.g. on
Windows).

7 years agoexamples: add README file with simple compilation instructions
Stefano Sabatini [Thu, 13 Sep 2012 19:12:56 +0000 (21:12 +0200)]
examples: add README file with simple compilation instructions

7 years agoMerge commit '66a1ccd7467ab1913cd8877114c6d4c2588bb12f'
Michael Niedermayer [Tue, 16 Oct 2012 11:27:19 +0000 (13:27 +0200)]
Merge commit '66a1ccd7467ab1913cd8877114c6d4c2588bb12f'

* commit '66a1ccd7467ab1913cd8877114c6d4c2588bb12f':
  configure: simplify argument handling in check_ld

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '4c995fafd861f537360b3717901cdbed6a6844e7'
Michael Niedermayer [Tue, 16 Oct 2012 11:19:11 +0000 (13:19 +0200)]
Merge commit '4c995fafd861f537360b3717901cdbed6a6844e7'

* commit '4c995fafd861f537360b3717901cdbed6a6844e7':
  configure: simplify get_version() function
  build: support asan and tsan toolchain shortcuts
  rmdec: Move SIPR code shared with Matroska demuxer to a separate file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agogitignore: add *.dylib for those of us on Darwin/OS X systems.
Andrew Euell [Tue, 16 Oct 2012 02:14:09 +0000 (04:14 +0200)]
gitignore: add *.dylib for those of us on Darwin/OS X systems.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomandelbrot: fix inner=period coloring routine
Michael Niedermayer [Tue, 16 Oct 2012 02:00:55 +0000 (04:00 +0200)]
mandelbrot: fix inner=period coloring routine

Fixes CID717571
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agox86/motion_est: widen before multiply.
Michael Niedermayer [Tue, 16 Oct 2012 01:09:28 +0000 (03:09 +0200)]
x86/motion_est: widen before multiply.

This fixes CID700558, CID700557, CID700556
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomxfenc: explicitly truncate continuity count.
Michael Niedermayer [Mon, 15 Oct 2012 13:58:44 +0000 (15:58 +0200)]
mxfenc: explicitly truncate continuity count.

The field is intended to overflow and have only its low 16bits stored.
This commit avoids the implicit truncation and clarifies that its
intended and not a bug

S326m section 7.6 ("Continuity count"):
> The continuity count word consists of 2 bytes allow-
> ing a number to be created by a modulo 65536
> counter (bits C15 to C0 in figure 7). The continuity
> count shall increment by 1 for each newly transmit-
> ted content package with the same SDTI source and
> destination addresses. The continuity count may
> be used to detect whether the content package
> sequence has been broken by an operation such as
> a routing switch.

Approved-by: Tjoppen
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomsvideo1enc: fix interframe encoding
Michael Niedermayer [Tue, 16 Oct 2012 00:21:35 +0000 (02:21 +0200)]
msvideo1enc: fix interframe encoding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: Override r_frame_rate by corrected timebase only for interlaced streams
Michael Niedermayer [Mon, 15 Oct 2012 23:04:42 +0000 (01:04 +0200)]
ffmpeg: Override r_frame_rate by corrected timebase only for interlaced streams

Fixes Ticket1664

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoutils: consider mpeg4 in mp4/mov to have a unreliable timebase
Michael Niedermayer [Mon, 15 Oct 2012 23:04:02 +0000 (01:04 +0200)]
utils: consider mpeg4 in mp4/mov to have a unreliable timebase

Partly fixes Ticket1664

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agora288: assert order to be withinn supported range in do_hybrid_window()
Michael Niedermayer [Mon, 15 Oct 2012 21:51:38 +0000 (23:51 +0200)]
ra288: assert order to be withinn supported range in do_hybrid_window()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomsvideo1enc: fix initial keyframe value
Michael Niedermayer [Mon, 15 Oct 2012 21:04:22 +0000 (23:04 +0200)]
msvideo1enc: fix initial keyframe value

keyframe was never set to anything but 1

Fixes CID733730
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/ass: extend syntax for ass filter
Stefano Sabatini [Mon, 15 Oct 2012 08:06:52 +0000 (10:06 +0200)]
lavfi/ass: extend syntax for ass filter

Make the filter accept named options for the first argument, and update
documentation accordingly.

7 years agotools/ffeval: include compat/getopt.c in case of missing system getopt()
Stefano Sabatini [Mon, 15 Oct 2012 19:46:33 +0000 (21:46 +0200)]
tools/ffeval: include compat/getopt.c in case of missing system getopt()

7 years agoexamples/muxing: extend usage notice
Stefano Sabatini [Mon, 15 Oct 2012 13:42:16 +0000 (15:42 +0200)]
examples/muxing: extend usage notice

7 years agoMerge branch 'docu' of https://github.com/rdp/FFmpeg
Michael Niedermayer [Mon, 15 Oct 2012 19:21:58 +0000 (21:21 +0200)]
Merge branch 'docu' of https://github.com/rdp/FFmpeg

* 'docu' of https://github.com/rdp/FFmpeg:
  docu: add word resize to scale filter, to make searching for the word resize simpler
  docu: change verb flite
  docu: add flite ffmpeg example
  docu: fix flite example

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorangecoder-test: Return in case of an error
Diego Biurrun [Fri, 12 Oct 2012 19:14:56 +0000 (21:14 +0200)]
rangecoder-test: Return in case of an error

7 years agoffmpeg: check timebase validity before using it.
Michael Niedermayer [Mon, 15 Oct 2012 18:35:01 +0000 (20:35 +0200)]
ffmpeg: check timebase validity before using it.

Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: pad examples should be a @subsection
Nicolas Noirbent [Mon, 15 Oct 2012 10:05:17 +0000 (12:05 +0200)]
doc/filters: pad examples should be a @subsection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodocu: add word resize to scale filter, to make searching for the word resize simpler
rogerdpack [Mon, 15 Oct 2012 17:28:45 +0000 (11:28 -0600)]
docu: add word resize to scale filter, to make searching for the word resize simpler

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
7 years agodocu: change verb flite
rogerdpack [Mon, 15 Oct 2012 17:26:39 +0000 (11:26 -0600)]
docu: change verb flite

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
7 years agodocu: add flite ffmpeg example
rogerdpack [Mon, 15 Oct 2012 17:26:07 +0000 (11:26 -0600)]
docu: add flite ffmpeg example

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
7 years agodocu: fix flite example
rogerdpack [Mon, 15 Oct 2012 17:24:08 +0000 (11:24 -0600)]
docu: fix flite example

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
7 years agolavf/audiointerleave: check return value of av_new_packet()
Paul B Mahol [Mon, 15 Oct 2012 15:11:54 +0000 (15:11 +0000)]
lavf/audiointerleave: check return value of av_new_packet()

Fixes CID733709.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agonutdec: check return value of av_new_packet()
Paul B Mahol [Mon, 15 Oct 2012 15:20:40 +0000 (15:20 +0000)]
nutdec: check return value of av_new_packet()

Fixes CID733173.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agodv: Set FS flag from AVFrame.top_field_first
Tomas Härdin [Mon, 15 Oct 2012 15:15:37 +0000 (17:15 +0200)]
dv: Set FS flag from AVFrame.top_field_first

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodvdec: Set top_field_first from FS flag
Tomas Härdin [Mon, 15 Oct 2012 14:24:39 +0000 (16:24 +0200)]
dvdec: Set top_field_first from FS flag

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodvdec: Move the VSC pack parsing to before avctx->execute()
Tomas Härdin [Mon, 15 Oct 2012 14:13:18 +0000 (16:13 +0200)]
dvdec: Move the VSC pack parsing to before avctx->execute()

This allows the next commit to parse the FS flag.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agorawdec.c: Extract interlace information from quicktime flag if it exisits.
Tim Nicholson [Mon, 15 Oct 2012 08:47:38 +0000 (09:47 +0100)]
rawdec.c: Extract interlace information from quicktime flag if it exisits.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agobuild: simplify enabling of compat objects
Mans Rullgard [Sun, 14 Oct 2012 16:56:00 +0000 (17:56 +0100)]
build: simplify enabling of compat objects

Add a configure function to pull in a compat object and set up
redirects in one operation.  This avoids duplicating conditions
across configure and makefiles.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoconfigure: simplify argument handling in check_ld
Mans Rullgard [Sun, 14 Oct 2012 00:35:56 +0000 (01:35 +0100)]
configure: simplify argument handling in check_ld

Use the existing filter functions instead of open-coding the
separation of general flags and libraries.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoconfigure: simplify get_version() function
Mans Rullgard [Sat, 13 Oct 2012 21:56:25 +0000 (22:56 +0100)]
configure: simplify get_version() function

awk alone can do this, no need for grep.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agobuild: support asan and tsan toolchain shortcuts
Luca Barbato [Sun, 14 Oct 2012 05:54:22 +0000 (07:54 +0200)]
build: support asan and tsan toolchain shortcuts

7 years agoflvdec: check return value of create_stream()
Paul B Mahol [Mon, 15 Oct 2012 15:59:53 +0000 (15:59 +0000)]
flvdec: check return value of create_stream()

Fixes null pointer dereference. Fixes CID732242.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoidcin: check chunk_size value before using it
Paul B Mahol [Mon, 15 Oct 2012 15:48:13 +0000 (15:48 +0000)]
idcin: check chunk_size value before using it

Fixes integer overflow. Fixes CID732223.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoimg2dec: check return value of av_new_packet()
Paul B Mahol [Mon, 15 Oct 2012 14:53:56 +0000 (14:53 +0000)]
img2dec: check return value of av_new_packet()

Fixes CID703626.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoh264: use designated initializers for AVClass
Paul B Mahol [Mon, 15 Oct 2012 13:43:33 +0000 (13:43 +0000)]
h264: use designated initializers for AVClass

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoexamples/muxing: provide more information in case of avcodec_open2 failure
Stefano Sabatini [Mon, 15 Oct 2012 13:34:36 +0000 (15:34 +0200)]
examples/muxing: provide more information in case of avcodec_open2 failure

7 years agoexamples/muxing: add missing error checks
Stefano Sabatini [Mon, 15 Oct 2012 13:33:58 +0000 (15:33 +0200)]
examples/muxing: add missing error checks

7 years agoexamples/muxing: fix case inconsistency in message
Stefano Sabatini [Mon, 15 Oct 2012 13:20:35 +0000 (15:20 +0200)]
examples/muxing: fix case inconsistency in message

7 years agoxbmenc: cosmetics: reindent
Paul B Mahol [Mon, 15 Oct 2012 13:28:23 +0000 (13:28 +0000)]
xbmenc: cosmetics: reindent

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoflacdec: replace -1 with AV_SAMPLE_FMT_NONE
Paul B Mahol [Mon, 15 Oct 2012 13:26:47 +0000 (13:26 +0000)]
flacdec: replace -1 with AV_SAMPLE_FMT_NONE

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agomovenc: fix tmcd parameters
Michael Niedermayer [Mon, 15 Oct 2012 12:57:07 +0000 (14:57 +0200)]
movenc: fix tmcd parameters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoshorten: fix U8 to be planar too
Michael Niedermayer [Mon, 15 Oct 2012 12:26:32 +0000 (14:26 +0200)]
shorten: fix U8 to be planar too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosmacker: return more meaningfull error codes
Paul B Mahol [Mon, 15 Oct 2012 12:08:24 +0000 (12:08 +0000)]
smacker: return more meaningfull error codes

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

* qatar/master:
  swscale: try to use mmap only if available
  configure: check for mprotect
  wmapro: use planar sample format
  wmalossless: output in planar sample format
  wmadec: use float planar sample format output
  shorten: use planar sample format
  lavc: update documentation for AVFrame.extended_data

Conflicts:
libavcodec/shorten.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agormdec: Move SIPR code shared with Matroska demuxer to a separate file
Diego Biurrun [Sun, 14 Oct 2012 21:41:12 +0000 (23:41 +0200)]
rmdec: Move SIPR code shared with Matroska demuxer to a separate file

7 years agolavf/txd: cosmetics: fix identation
Paul B Mahol [Mon, 15 Oct 2012 08:11:24 +0000 (08:11 +0000)]
lavf/txd: cosmetics: fix identation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavf/mkv: avoid negative ts by default.
Clément Bœsch [Wed, 10 Oct 2012 12:32:43 +0000 (14:32 +0200)]
lavf/mkv: avoid negative ts by default.

This fixes playback in some circumstances (like webm in firefox).
Regression after 2c34367b.

It is also matching the Matroska specifications:
http://matroska.org/technical/specs/notes.html, "The quick eye will
notice that if a Cluster's Timecode is set to zero, it is possible to
have Blocks with a negative Raw Timecode. Blocks with a negative Raw
Timecode are not valid."

7 years agotests: add fate-xface test
Stefano Sabatini [Sat, 13 Oct 2012 16:43:39 +0000 (18:43 +0200)]
tests: add fate-xface test

7 years agolavc: add xface image decoder and encoder
Stefano Sabatini [Wed, 25 Jul 2012 10:23:31 +0000 (12:23 +0200)]
lavc: add xface image decoder and encoder

Based on libcompface code by James Ashton <James.Ashton@anu.edu.au>, and
relicensed to LGPL with the author's consent.

7 years agoswscale: try to use mmap only if available
Mans Rullgard [Sat, 13 Oct 2012 16:00:16 +0000 (16:00 +0000)]
swscale: try to use mmap only if available

Some systems, e.g. Minix, have sys/mman.h defining MAP_ANONYMOUS without
providing (working) mmap and friends.  The mmx filter generation code
checks only for MAP_ANONYMOUS, not for availability of mmap itself which
leads to build errors on aforementioned systems.

This changes the conditional compilation to use mmap only if all the
required functions are available.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoconfigure: check for mprotect
Mans Rullgard [Sat, 13 Oct 2012 02:40:48 +0000 (02:40 +0000)]
configure: check for mprotect

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoh264: Change asserts to av_asserts in ff_h264_fill_default_ref_list()
Michael Niedermayer [Mon, 15 Oct 2012 01:22:00 +0000 (03:22 +0200)]
h264: Change asserts to av_asserts in ff_h264_fill_default_ref_list()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2kenc: remove unneeded dereference
Michael Niedermayer [Mon, 15 Oct 2012 01:18:08 +0000 (03:18 +0200)]
j2kenc: remove unneeded dereference

Fixes CID703723
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: use framerate not fieldrate as filter input.
Michael Niedermayer [Sun, 14 Oct 2012 22:14:43 +0000 (00:14 +0200)]
ffmpeg: use framerate not fieldrate as filter input.

Fixes a problem described in Ticket1065

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffplay: Prevent 0/0 aspect from being passed on to lavfi
Michael Niedermayer [Sun, 14 Oct 2012 21:40:14 +0000 (23:40 +0200)]
ffplay: Prevent 0/0 aspect from being passed on to lavfi

0/0 fails to be parsed

Fixes Ticket1814
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowmapro: use planar sample format
Justin Ruggles [Wed, 29 Aug 2012 02:49:17 +0000 (22:49 -0400)]
wmapro: use planar sample format

7 years agowmalossless: output in planar sample format
Justin Ruggles [Sat, 25 Aug 2012 23:09:40 +0000 (19:09 -0400)]
wmalossless: output in planar sample format

7 years agowmadec: use float planar sample format output
Justin Ruggles [Wed, 29 Aug 2012 03:12:49 +0000 (23:12 -0400)]
wmadec: use float planar sample format output

7 years agoshorten: use planar sample format
Justin Ruggles [Tue, 28 Aug 2012 18:02:41 +0000 (14:02 -0400)]
shorten: use planar sample format

7 years agoj2kdec: remove unneeded operation
Michael Niedermayer [Sun, 14 Oct 2012 20:13:37 +0000 (22:13 +0200)]
j2kdec: remove unneeded operation

Fixes CID717554
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 agolavc: update documentation for AVFrame.extended_data
Justin Ruggles [Sun, 14 Oct 2012 18:31:47 +0000 (14:31 -0400)]
lavc: update documentation for AVFrame.extended_data

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>