c079da5073
Merge commit '0bca0283ccded5e32da143a462168ad1988a58fd'
...
* commit '0bca0283ccded5e32da143a462168ad1988a58fd':
riff: do not write empty INFO tags
Conflicts:
tests/ref/fate/vsynth1-cljr
tests/ref/fate/vsynth1-ffvhuff
tests/ref/fate/vsynth1-h261
tests/ref/fate/vsynth1-h263
tests/ref/fate/vsynth1-h263-obmc
tests/ref/fate/vsynth1-h263p
tests/ref/fate/vsynth1-huffyuv
tests/ref/fate/vsynth1-jpegls
tests/ref/fate/vsynth1-mjpeg
tests/ref/fate/vsynth1-mpeg4-adap
tests/ref/fate/vsynth1-mpeg4-adv
tests/ref/fate/vsynth1-mpeg4-error
tests/ref/fate/vsynth1-mpeg4-nr
tests/ref/fate/vsynth1-mpeg4-qpel
tests/ref/fate/vsynth1-mpeg4-qprd
tests/ref/fate/vsynth1-mpeg4-rc
tests/ref/fate/vsynth1-mpeg4-thread
tests/ref/fate/vsynth1-msmpeg4
tests/ref/fate/vsynth1-msmpeg4v2
tests/ref/fate/vsynth1-rgb
tests/ref/fate/vsynth1-wmv1
tests/ref/fate/vsynth1-wmv2
tests/ref/fate/vsynth1-yuv
tests/ref/fate/vsynth2-cljr
tests/ref/fate/vsynth2-ffvhuff
tests/ref/fate/vsynth2-h261
tests/ref/fate/vsynth2-h263
tests/ref/fate/vsynth2-h263-obmc
tests/ref/fate/vsynth2-h263p
tests/ref/fate/vsynth2-huffyuv
tests/ref/fate/vsynth2-jpegls
tests/ref/fate/vsynth2-mjpeg
tests/ref/fate/vsynth2-mpeg4-adap
tests/ref/fate/vsynth2-mpeg4-error
tests/ref/fate/vsynth2-mpeg4-nr
tests/ref/fate/vsynth2-mpeg4-qpel
tests/ref/fate/vsynth2-mpeg4-qprd
tests/ref/fate/vsynth2-mpeg4-rc
tests/ref/fate/vsynth2-mpeg4-thread
tests/ref/fate/vsynth2-msmpeg4
tests/ref/fate/vsynth2-msmpeg4v2
tests/ref/fate/vsynth2-rgb
tests/ref/fate/vsynth2-wmv1
tests/ref/fate/vsynth2-wmv2
tests/ref/fate/vsynth2-yuv
tests/ref/lavf/avi
tests/ref/seek/h261_avi
tests/ref/seek/h263_avi
tests/ref/seek/h263p_avi
tests/ref/seek/lavf_avi
tests/ref/seek/mjpeg_avi
tests/ref/seek/mpeg4_adap_avi
tests/ref/seek/mpeg4_error_avi
tests/ref/seek/mpeg4_nr_avi
tests/ref/seek/mpeg4_qpel_avi
tests/ref/seek/mpeg4_qprd_avi
tests/ref/seek/mpeg4_rc_avi
tests/ref/seek/mpeg4_thread_avi
tests/ref/seek/msmpeg4_avi
tests/ref/seek/msmpeg4v2_avi
tests/ref/seek/wmv1_avi
tests/ref/seek/wmv2_avi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 14:43:26 +02:00
fadfbb354b
Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'
...
* commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68':
lavf: move RIFF INFO tag writing from avienc to riff
avconv: fix disabling auto mappings with -map_metadata
Conflicts:
ffmpeg_opt.c
libavformat/riff.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 14:30:25 +02:00
d6e87190fd
Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc'
...
* commit 'a25d912dca9cd553440167e0476c47581359c0fc':
avcodec_encode_audio(): fix invalid free
pcm-mpeg: correct bitrate calculation
ffv1: K&R formatting cosmetics
fate: Add rangecoder test
network: #include stdint.h in network.h
nut: export codec_tag provided by rawvideo
avserver: move avserver-specific code from ffmdec.c to avserver.c
Conflicts:
ffserver.c
libavcodec/ffv1.c
libavformat/ffmdec.c
libavformat/nutenc.c
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>
2012-10-17 14:17:55 +02:00
1ade37ae9c
lavc/tta: use meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-17 12:11:34 +00:00
d6ea59b860
tta: datalen is unsigned integer per reference library
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-17 11:58:08 +00:00
364c60bf64
sws-test: parse command line args before initing contexts
...
This fixes parsing comand line args after ref
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 11:56:36 +02:00
711ffb84df
lavf/swfdec: support DefineBitsLossless{,2} tag.
2012-10-17 07:49:17 +02:00
4e2e3d943e
ffv1: fix packed rgb with 1.3
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 03:19:11 +02:00
adbb75dbd8
mov: fix time types related to mov_metadata_creation_time
...
Fixes Ticket1817
Based on patch by: Przemyslaw Wesolek <przemyslaw.wesolek@go.art.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 02:48:30 +02:00
7b8fd29816
examples/muxing: fix video pts
...
Fixes Ticket1801
Based on suggestion from AztecC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 02:40:00 +02:00
5d2b885074
lavfi: limit matching w/h/fmt asserts to non scale filters
...
This fixes a regression with the scale filters input changing.
In the long run filters should get a flag to indicate support of this
and then this flag be used here.
But the regression should not be left standing until thats done.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 00:06:12 +02:00
6cbb8a450f
libavfilter/buffersrc: Do not fail hard on changes of input parameters.
...
Several filters support this already.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 00:06:12 +02:00
3e0b29ccd0
ffmpeg: Make video filter graph reinit user selectable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 00:06:12 +02:00
a07e9d72a1
yuvPlanartouyvy_c: fix sign extension
...
Fixes CID732281
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 21:06:24 +02:00
a30972609c
yuvPlanartoyuy2_c: fix sign extension
...
Fixes CID732282
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 20:50:53 +02:00
cb65b32c97
mp3enc: remove unneeded null ptr check
...
Fixes: CID733746
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 20:27:16 +02:00
6d55a40b00
mov: print warning if ff_get_wav_header() fails
...
Fixes CID717497
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 20:21:31 +02:00
24d6af0f7e
sierravmd: flip reduce arg order.
...
This should make no difference but might help static analyzers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 20:03:37 +02:00
de6c150444
nut: fix int32 overflow
...
Fixes CID700574
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 19:59:01 +02:00
340305646a
riff: fix division by zero for G726
...
Fixes CID717752
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 19:56:05 +02:00
9de5b11d58
swr-test: fix division by 0
...
Fixes CID733739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 19:40:57 +02:00
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
0bca0283cc
riff: do not write empty INFO tags
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2012-10-16 18:51:16 +02:00
71e92414bf
lavf: move RIFF INFO tag writing from avienc to riff
...
It will be useful in the wav muxer.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2012-10-16 18:50:36 +02:00
a119c64e38
avconv: fix disabling auto mappings with -map_metadata
...
CC: libav-stable@libav.org
2012-10-16 18:49:59 +02:00
a25d912dca
avcodec_encode_audio(): fix invalid free
...
Since 2bc0de385
2012-10-16 18:49:31 +02:00
4a7429203a
pcm-mpeg: correct bitrate calculation
...
Bitrate calculation is off since the bluray spec always specifies
an even number of coded channels. This was honored in the decoder,
but not for bitrate calculation.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-10-16 16:03:03 +02:00
9a978b334b
ffv1: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2012-10-16 15:45:55 +02:00
c0a6cac292
fate: Add rangecoder test
2012-10-16 15:45:55 +02:00
1fbaabefc4
network: #include stdint.h in network.h
...
This header uses various types provided by stdint.h without
explicitly including it.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-16 14:45:29 +01:00
21de6ba5c1
nut: export codec_tag provided by rawvideo
...
Raw audio does not provide valid audio tags while rawvideo does.
The fate refs have to be updated because it undoes the previous tag
change.
2012-10-16 15:26:31 +02:00
3b20eb25e7
avserver: move avserver-specific code from ffmdec.c to avserver.c
...
This way avserver only depends on the data structures of the ffm
demuxer, which it already does, and not also on private functions
being exported by the library.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-16 14:20:05 +01:00
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
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
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
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
7ca102a7d7
examples: add README file with simple compilation instructions
2012-10-16 13:34:48 +02:00
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
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
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
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
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
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
1fe45903b8
msvideo1enc: fix interframe encoding
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 02:22:27 +02:00
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
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
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
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
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
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
Michael Niedermayer
Paul B Mahol
Clément Bœsch
Victor Vasiliev
Anton Khirnov
Rafaël Carré
Christian Schmidt
Luca Barbato
Diego Biurrun
Mans Rullgard
Stefano Sabatini
Andrew Euell