775d41b617
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: Add support for Tilera processors
wavdec: check size before reading the data, not after.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
940ee63630
Merge commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4'
...
* commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4':
wav: do not fail on empty INFO tags
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
df5e089da9
Merge commit '31c54711cc3f1484af101d629bbb805820d37ad1'
...
* commit '31c54711cc3f1484af101d629bbb805820d37ad1':
lavf: split wav muxer and demuxer into separate files.
Conflicts:
libavformat/wavdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
d8cfa98358
Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'
...
* commit '58b619c8a226cc4564ad5af291bc99a04f89ee56':
wav muxer: write metadata
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
1ade37ae9c
lavc/tta: use meaningful error codes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
d6ea59b860
tta: datalen is unsigned integer per reference library
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
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>
12 years ago
711ffb84df
lavf/swfdec: support DefineBitsLossless{,2} tag.
12 years ago
4e2e3d943e
ffv1: fix packed rgb with 1.3
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
7b8fd29816
examples/muxing: fix video pts
...
Fixes Ticket1801
Based on suggestion from AztecC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
c75848cd4c
configure: Add support for Tilera processors
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
12 years ago
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>
12 years ago
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>
12 years ago
3e0b29ccd0
ffmpeg: Make video filter graph reinit user selectable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
a07e9d72a1
yuvPlanartouyvy_c: fix sign extension
...
Fixes CID732281
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
a30972609c
yuvPlanartoyuy2_c: fix sign extension
...
Fixes CID732282
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
cb65b32c97
mp3enc: remove unneeded null ptr check
...
Fixes: CID733746
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
6d55a40b00
mov: print warning if ff_get_wav_header() fails
...
Fixes CID717497
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
24d6af0f7e
sierravmd: flip reduce arg order.
...
This should make no difference but might help static analyzers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
de6c150444
nut: fix int32 overflow
...
Fixes CID700574
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
340305646a
riff: fix division by zero for G726
...
Fixes CID717752
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
9de5b11d58
swr-test: fix division by 0
...
Fixes CID733739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
dd3e5baa59
swr-test: check pointers before use
...
Fixes: CID733807, CID733806
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
a43283b6f4
wavdec: check size before reading the data, not after.
12 years ago
79922d7237
wav: do not fail on empty INFO tags
...
Fixes Bug 379
CC: libav-stable@libav.org
12 years ago
31c54711cc
lavf: split wav muxer and demuxer into separate files.
12 years ago
58b619c8a2
wav muxer: write metadata
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years ago
0bca0283cc
riff: do not write empty INFO tags
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
12 years ago
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>
12 years ago
a119c64e38
avconv: fix disabling auto mappings with -map_metadata
...
CC: libav-stable@libav.org
12 years ago
a25d912dca
avcodec_encode_audio(): fix invalid free
...
Since 2bc0de385
12 years ago
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>
12 years ago
9a978b334b
ffv1: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
12 years ago
c0a6cac292
fate: Add rangecoder test
12 years ago
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>
12 years ago
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.
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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>
12 years ago
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).
12 years ago
7ca102a7d7
examples: add README file with simple compilation instructions
12 years ago
d15be9108e
Merge commit '66a1ccd7467ab1913cd8877114c6d4c2588bb12f'
...
* commit '66a1ccd7467ab1913cd8877114c6d4c2588bb12f':
configure: simplify argument handling in check_ld
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
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>
12 years ago
36b3b2376d
gitignore: add *.dylib for those of us on Darwin/OS X systems.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
4cc4ca5847
mandelbrot: fix inner=period coloring routine
...
Fixes CID717571
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
Paul B Mahol
Clément Bœsch
Derek Buitenhuis
Anton Khirnov
Victor Vasiliev
Rafaël Carré
Christian Schmidt
Luca Barbato
Diego Biurrun
Mans Rullgard
Stefano Sabatini
Andrew Euell