Michael Niedermayer
dd3e5baa59
swr-test: check pointers before use
...
Fixes: CID733807, CID733806
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 19:39:25 +02:00
Michael Niedermayer
8227d36bd3
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
build: simplify linking tools with cmdutils.o
tiny_psnr: fix range calculation for sample size of 32 bits
Conflicts:
Makefile
tests/tiny_psnr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 14:15:16 +02:00
Michael Niedermayer
83962004f7
Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'
...
* commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b':
tiny_psnr: check for specified sample size less than 1
fate: improve md5sum utility selection
rangecoder-test: Drop timer output that clutters stderr
Conflicts:
tests/tiny_psnr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 14:04:14 +02:00
Michael Niedermayer
5717562c78
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>
2012-10-16 13:57:10 +02:00
Stefano Sabatini
25f3827e1d
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).
2012-10-16 13:51:44 +02:00
Stefano Sabatini
7ca102a7d7
examples: add README file with simple compilation instructions
2012-10-16 13:34:48 +02:00
Michael Niedermayer
d15be9108e
Merge commit '66a1ccd7467ab1913cd8877114c6d4c2588bb12f'
...
* commit '66a1ccd7467ab1913cd8877114c6d4c2588bb12f':
configure: simplify argument handling in check_ld
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 13:27:19 +02:00
Michael Niedermayer
9270a2b374
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>
2012-10-16 13:20:46 +02:00
Andrew Euell
36b3b2376d
gitignore: add *.dylib for those of us on Darwin/OS X systems.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 04:14:09 +02:00
Michael Niedermayer
4cc4ca5847
mandelbrot: fix inner=period coloring routine
...
Fixes CID717571
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 04:00:55 +02:00
Michael Niedermayer
9c669672c7
x86/motion_est: widen before multiply.
...
This fixes CID700558, CID700557, CID700556
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 03:09:28 +02:00
Michael Niedermayer
3896cd11a1
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>
2012-10-16 03:01:15 +02:00
Michael Niedermayer
1fe45903b8
msvideo1enc: fix interframe encoding
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 02:22:27 +02:00
Michael Niedermayer
ba31e59e83
ffmpeg: Override r_frame_rate by corrected timebase only for interlaced streams
...
Fixes Ticket1664
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 01:04:42 +02:00
Michael Niedermayer
901f4bb6fc
utils: consider mpeg4 in mp4/mov to have a unreliable timebase
...
Partly fixes Ticket1664
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 01:04:02 +02:00
Michael Niedermayer
f5581266f7
ra288: assert order to be withinn supported range in do_hybrid_window()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-15 23:55:54 +02:00
Michael Niedermayer
db3a0aae9f
msvideo1enc: fix initial keyframe value
...
keyframe was never set to anything but 1
Fixes CID733730
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-15 23:52:08 +02:00
Mans Rullgard
07b3790d36
build: simplify linking tools with cmdutils.o
...
This avoids repeating cmdutils.o in both the prerequisites and
the link command.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-15 22:28:07 +01:00
Mans Rullgard
bf868c4a9b
tiny_psnr: fix range calculation for sample size of 32 bits
...
For a sample size of 32 bits, the shift would overflow producing
undefined results. Incidentally, in the only test currently using
32-bit samples, the output matches the reference exactly on most
systems meaning the bad 'max' value is never used.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-15 21:41:25 +01:00
Mans Rullgard
3dc06b6972
tiny_psnr: check for specified sample size less than 1
...
A zero or negative sample size is impossible and should be
reported as an error.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-15 21:40:18 +01:00
Stefano Sabatini
faa1cb50ed
lavfi/ass: extend syntax for ass filter
...
Make the filter accept named options for the first argument, and update
documentation accordingly.
2012-10-15 22:40:08 +02:00
Mans Rullgard
099294577c
fate: improve md5sum utility selection
...
The 'md5sum' command is used with the -b flag so the presence test
must also use this flag.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-15 21:40:08 +01:00
Stefano Sabatini
22c5cc239c
tools/ffeval: include compat/getopt.c in case of missing system getopt()
2012-10-15 21:58:02 +02:00
Stefano Sabatini
a726ac9a11
examples/muxing: extend usage notice
2012-10-15 21:36:14 +02:00
Michael Niedermayer
0cc3cd5c65
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>
2012-10-15 21:22:10 +02:00
Diego Biurrun
f1be514540
rangecoder-test: Drop timer output that clutters stderr
2012-10-15 21:16:36 +02:00
Diego Biurrun
c1fcfdec75
rangecoder-test: Return in case of an error
2012-10-15 21:15:17 +02:00
Michael Niedermayer
547ec4d303
ffmpeg: check timebase validity before using it.
...
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-15 20:35:45 +02:00
Nicolas Noirbent
af32a1f2d1
doc/filters: pad examples should be a @subsection
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-15 20:35:45 +02:00
rogerdpack
dfd085aae2
docu: add word resize to scale filter, to make searching for the word resize simpler
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2012-10-15 11:28:45 -06:00
rogerdpack
a8eaa9ebc6
docu: change verb flite
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2012-10-15 11:26:39 -06:00
rogerdpack
7f5a78a0da
docu: add flite ffmpeg example
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2012-10-15 11:26:07 -06:00
rogerdpack
d9d5470636
docu: fix flite example
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2012-10-15 11:24:08 -06:00
Paul B Mahol
3ca8a23288
lavf/audiointerleave: check return value of av_new_packet()
...
Fixes CID733709.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-15 17:03:41 +00:00
Paul B Mahol
bb502411dd
nutdec: check return value of av_new_packet()
...
Fixes CID733173.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-15 17:03:41 +00:00
Tomas Härdin
8cbb8f5357
dv: Set FS flag from AVFrame.top_field_first
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-15 18:53:44 +02:00
Tomas Härdin
7b383bd9d7
dvdec: Set top_field_first from FS flag
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-15 18:53:44 +02:00
Tomas Härdin
2b4bbd12c2
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>
2012-10-15 18:53:44 +02:00
Tim Nicholson
0ee57f8b14
rawdec.c: Extract interlace information from quicktime flag if it exisits.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-15 18:53:44 +02:00
Mans Rullgard
84e65c763d
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>
2012-10-15 17:46:19 +01:00
Mans Rullgard
66a1ccd746
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>
2012-10-15 17:46:18 +01:00
Mans Rullgard
4c995fafd8
configure: simplify get_version() function
...
awk alone can do this, no need for grep.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-15 17:46:18 +01:00
Luca Barbato
0fbb62a8e6
build: support asan and tsan toolchain shortcuts
2012-10-15 18:25:35 +02:00
Paul B Mahol
d7d5b5dfc1
flvdec: check return value of create_stream()
...
Fixes null pointer dereference. Fixes CID732242.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-15 15:59:53 +00:00
Paul B Mahol
295218f531
idcin: check chunk_size value before using it
...
Fixes integer overflow. Fixes CID732223.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-15 15:48:13 +00:00
Paul B Mahol
3f8148911c
img2dec: check return value of av_new_packet()
...
Fixes CID703626.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-15 14:53:56 +00:00
Paul B Mahol
011f3892ff
h264: use designated initializers for AVClass
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-15 13:43:33 +00:00
Stefano Sabatini
59e31aa2ca
examples/muxing: provide more information in case of avcodec_open2 failure
2012-10-15 15:35:50 +02:00
Stefano Sabatini
6133149e0c
examples/muxing: add missing error checks
2012-10-15 15:35:50 +02:00
Stefano Sabatini
e56b3a5ebb
examples/muxing: fix case inconsistency in message
2012-10-15 15:35:49 +02:00