f03c0f6afc
ffmdec: check av_new_packet() return value
...
Fixes CID733711
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-17 20:45:59 +02:00
a0e0e1e192
ffmdec: fix hypothetical overflows
...
Fixes CID703739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-17 20:36:30 +02:00
7fd65104f4
ffm_seek: fix division by zero
...
Fixes CID732202
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-17 20:14:43 +02:00
a4fe661157
mov_probe: fix integer overflows
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-17 17:50:14 +02:00
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 >
2012-10-17 15:53:42 +02:00
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 >
2012-10-17 15:46:08 +02:00
d8cfa98358
Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'
...
* commit '58b619c8a226cc4564ad5af291bc99a04f89ee56':
wav muxer: write metadata
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-17 15:16:23 +02:00
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
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
711ffb84df
lavf/swfdec: support DefineBitsLossless{,2} tag.
2012-10-17 07:49:17 +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
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
a43283b6f4
wavdec: check size before reading the data, not after.
2012-10-16 18:52:21 +02:00
79922d7237
wav: do not fail on empty INFO tags
...
Fixes Bug 379
CC: libav-stable@libav.org
2012-10-16 18:52:14 +02:00
31c54711cc
lavf: split wav muxer and demuxer into separate files.
2012-10-16 18:52:07 +02:00
58b619c8a2
wav muxer: write metadata
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2012-10-16 18:51:56 +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
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
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
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
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
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
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
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
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
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
5c7a62aef5
movenc: fix tmcd parameters
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-15 15:09:46 +02:00
7e68c91e24
rmdec: Move SIPR code shared with Matroska demuxer to a separate file
2012-10-15 13:34:07 +02:00
4f5e5a0513
lavf/txd: cosmetics: fix identation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2012-10-15 08:12:25 +00:00
b08273c9ca
lavf/mkv: avoid negative ts by default.
...
This fixes playback in some circumstances (like webm in firefox).
Regression after 2c34367bhttp://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."
2012-10-15 09:19:21 +02:00
cd559bb49a
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.
2012-10-15 08:32:18 +02:00
45bd0d15f4
lavf: fix fps detection with PAFF H.264
...
Fixes Ticket1065
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-14 19:20:23 +02:00
82c0055c5e
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 >
2012-10-14 14:46:13 +02:00
db51c65961
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 >
2012-10-14 14:31:55 +02:00
039341eb43
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 >
2012-10-14 10:41:16 +00:00
d31098113f
mp3enc: fix signed C99 overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-14 05:52:50 +02:00
693097c355
paf: avoid C99 overflows
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-14 04:01:41 +02:00
2fed05f53a
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 >
2012-10-14 03:34:16 +02:00
083c7bf701
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 >
2012-10-13 18:47:18 +02:00
6571833d1a
smjpegdec: use url_feof()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2012-10-13 14:15:58 +00:00
18884f159b
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 >
2012-10-13 15:42:49 +02:00
Michael Niedermayer