Michael Niedermayer
dd84efe3c7
matroskaenc: Fix hypothetical integer overflows
...
Fixes CID700562-7
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-20 19:05:15 +02:00
Michael Niedermayer
b1f517f503
matroskaenc: check avio_open_dyn_buf() retuen code
...
Fixes CID703629
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-20 19:05:15 +02:00
Michael Niedermayer
2c5b92fe90
matroskadec: fix double negation typo
...
Fixes CID602563
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-20 16:58:33 +02:00
Michael Niedermayer
1116491c53
matroska_parse_rm_audio: check for malloc failure
...
Fixes CID733712
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-20 16:55:45 +02:00
Michael Niedermayer
04c6ecb7da
Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed'
...
* commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed':
fate-vc1: add dependencies
ARM: fix overreads in neon h264 chroma mc
rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet
gitignore: ignore files created by msvc
fate: Add proper dependencies for the tests in video.mak
configure: Disable Snow decoder and encoder by default
lzo: Drop obsolete fast_memcpy reference
build: Drop OBJS declaration for non-existing PCM_DVD encoder
mpeg4videodec: Disable frame multithreading for GMC, its not implemented at all
Conflicts:
libavcodec/mpegvideo.c
libavformat/rtsp.c
tests/fate/microsoft.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-20 12:37:52 +02:00
Martin Storsjö
2f41eaa9c6
rtsp: Make sure the ret variable is initialized in ff_rtsp_fetch_packet
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-20 01:59:06 +03:00
Michael Niedermayer
8fb8d539a4
hlsproto: fix integer overflow
...
Fixes CID703743
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-19 23:24:03 +02:00
Michael Niedermayer
ba39303050
gxfenc: fix null ptr dereference
...
Fixes CID703677
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-19 23:21:41 +02:00
Michael Niedermayer
395caf3de8
hls: fix integer overflow
...
Fixes CID717892
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-19 23:00:47 +02:00
Michael Niedermayer
a96577df38
avio: fix sizeof argument
...
Fixes CID732284
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-19 22:35:32 +02:00
Michael Niedermayer
d30351363f
url_alloc_for_protocol: fix use of uninitialized variable
...
Fixes CID703830
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-19 22:14:13 +02:00
Michael Niedermayer
3d48dd01fd
avidec: remove unneeded null check
...
Fixes CID29555
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-19 21:46:39 +02:00
Petter Ericson
7abf394814
mov.c: Check for stsd + m1s tag indicating MOV-wrapped MPEG-PS, and force continued probing if found.
...
Fixes Ticket241
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-19 16:07:49 +02:00
Michael Niedermayer
81ff0c24ef
Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'
...
* commit '1cd432e167b1a80853760c89a33606e2b5f229c2':
configure: fix libcdio check
rtsp: Allow setting the reordering buffer size via an AVOption
rtsp: Vertically align a constant definition
rtp: Update the check for distinguishing between RTP and RTCP
aac: fix build with hardcoded tables
fate: dependencies for screen codec tests
riff: Move functions around to be covered by appropriate #ifdefs
Conflicts:
configure
tests/fate/screen.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-19 13:58:14 +02:00
Michael Niedermayer
93f244e3ab
Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'
...
* commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95':
avformat: Fix references to the removed function av_write_header in comments
changelog: Mention the MSVC DLL support
fate: add dependencies for misc microsoft codecs
fate-twinvq: add dependencies
fate-mpc: add dependencies
fate-indeo: add dependencies
fate-als: add dependencies
fate: dependencies for demux tests
Conflicts:
Changelog
tests/Makefile
tests/fate/demux.mak
tests/fate/microsoft.mak
tests/fate/mpc.mak
tests/fate/vqf.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-19 13:47:47 +02:00
Michael Niedermayer
b0554fec04
Merge commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72'
...
* commit 'c0329748b04e1f175dad8c9c2ebf22a5e2dc5b72':
fate: add a dependency helper macro
Add support for building shared libraries with MSVC
avcodec: Rename avpriv_frame_rate_tab to ff_mpeg12_frame_rate_tab
gxf: Add a local copy of the relevant parts of the frame rate table
configure: Split out msvc as a separate target OS
aviobuf: Remove a senseless ifdef in avio_seek
Conflicts:
configure
libavcodec/dirac.c
libavcodec/mpeg12data.h
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-19 13:29:24 +02:00
Martin Storsjö
3f055f8f5f
rtsp: Allow setting the reordering buffer size via an AVOption
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-18 23:10:48 +03:00
Martin Storsjö
1c37744963
rtsp: Vertically align a constant definition
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-18 23:10:42 +03:00
Martin Storsjö
0de9380be5
rtp: Update the check for distinguishing between RTP and RTCP
...
Also add enums for more RTCP packet types, according to the IANA
list of registered types.
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-18 23:10:20 +03:00
Diego Biurrun
7b2121e7e2
riff: Move functions around to be covered by appropriate #ifdefs
...
This fixes compilation with --disable-muxers.
2012-10-18 16:12:45 +02:00
Michael Niedermayer
d0c27e88d2
riff: retry reading metadata without padding if it fails with
...
Fixes Ticket1821
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-18 16:03:16 +02:00
Michael Niedermayer
1350dffdc6
riff: dont discard truncated metadata
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-18 16:02:50 +02:00
Martin Storsjö
0af1fe845a
avformat: Fix references to the removed function av_write_header in comments
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-18 16:33:48 +03:00
Martin Storsjö
fc085c5b33
gxf: Add a local copy of the relevant parts of the frame rate table
...
This avoids having to share this table across the library
boundaries.
This shared table used to be problematic, if always declaring
all exported data symbols with the dllimport attribute (even
while building that same library), since it needs to be a
link-time constant when it is used in AVCodec declarations
(in mpeg12enc.c).
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-18 14:26:13 +03:00
Michael Niedermayer
eb19d89d8e
cache: check lseek() return
...
Fixes CID717496
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-18 00:55:03 +02:00
Martin Storsjö
b760ffdd07
aviobuf: Remove a senseless ifdef in avio_seek
...
This seemed to assume that one never used writing avio unless
muxers or networking was enabled.
This ifdef is a remnant since 8fa641f8
.
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-18 01:44:05 +03:00
Michael Niedermayer
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
Michael Niedermayer
a0e0e1e192
ffmdec: fix hypothetical overflows
...
Fixes CID703739
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 20:36:30 +02:00
Michael Niedermayer
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
Michael Niedermayer
a4fe661157
mov_probe: fix integer overflows
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-17 17:50:14 +02:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Paul B Mahol
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
Clément Bœsch
711ffb84df
lavf/swfdec: support DefineBitsLossless{,2} tag.
2012-10-17 07:49:17 +02:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
de6c150444
nut: fix int32 overflow
...
Fixes CID700574
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 19:59:01 +02:00
Michael Niedermayer
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
Anton Khirnov
a43283b6f4
wavdec: check size before reading the data, not after.
2012-10-16 18:52:21 +02:00
Anton Khirnov
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
Anton Khirnov
31c54711cc
lavf: split wav muxer and demuxer into separate files.
2012-10-16 18:52:07 +02:00
Victor Vasiliev
58b619c8a2
wav muxer: write metadata
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2012-10-16 18:51:56 +02:00
Victor Vasiliev
0bca0283cc
riff: do not write empty INFO tags
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2012-10-16 18:51:16 +02:00
Victor Vasiliev
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
Mans Rullgard
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
Luca Barbato
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
Mans Rullgard
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
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
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
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
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
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
Michael Niedermayer
5c7a62aef5
movenc: fix tmcd parameters
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-15 15:09:46 +02:00
Diego Biurrun
7e68c91e24
rmdec: Move SIPR code shared with Matroska demuxer to a separate file
2012-10-15 13:34:07 +02:00
Paul B Mahol
4f5e5a0513
lavf/txd: cosmetics: fix identation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-15 08:12:25 +00:00
Clément Bœsch
b08273c9ca
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."
2012-10-15 09:19:21 +02:00
Stefano Sabatini
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Paul B Mahol
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
Michael Niedermayer
d31098113f
mp3enc: fix signed C99 overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-14 05:52:50 +02:00
Michael Niedermayer
693097c355
paf: avoid C99 overflows
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-14 04:01:41 +02:00
Michael Niedermayer
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
Dmitry Samonenko
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
Paul B Mahol
6571833d1a
smjpegdec: use url_feof()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-13 14:15:58 +00:00
Michael Niedermayer
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
d197bd4f5e
Merge commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066'
...
* commit '930c9d4373e0f3cb7c64fcfc129127a309f6d066':
avutil: Duplicate ff_log2_tab instead of sharing it across libs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-13 14:24:58 +02:00
Michael Niedermayer
3b0bb321a5
Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507'
...
* commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507':
avfilter: call x86 init functions under if (ARCH_X86), not if (HAVE_MMX)
rtspdec: Set the default port for listen mode, if none is specified
tscc2: Fix an out of array access
rtmpproto: Fix an out of array write
rtspdec: Fix use of uninitialized byte
vp8: reset loopfilter delta values at keyframes.
avutil: add yuva422p and yuva444p formats
Conflicts:
libavutil/pixdesc.c
libavutil/pixfmt.h
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-13 14:14:11 +02:00
Luca Barbato
1bd442c276
nut: prioritize native tags
...
Use native tags instead of avi ones, simplifies a lot raw video codecs
handling.
2012-10-13 12:33:18 +02:00
Luca Barbato
92281850a2
nut: support pcm codecs not mapped in avi
...
The native tags will be used when available.
2012-10-13 12:33:18 +02:00
Carl Eugen Hoyos
6254ffe0ca
Allow autodetection of some dnxhd files that can be decoded correctly.
...
Fixes ticket #1807 .
2012-10-13 11:59:37 +02:00
Michael Niedermayer
f657d495b0
rtpdec_qdm2: change one assert to av_assert0
...
Failure of this assert could lead to hard to debug behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-13 03:32:37 +02:00
Michael Niedermayer
e47024d72f
wtvdec: fix memleak on error
...
Fixes CID718002
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-13 02:37:47 +02:00
Michael Niedermayer
120b38b966
avio: redesign ffio_rewind_with_probe_data()
...
This prevents a double free
Fixes CID718285
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-13 02:08:59 +02:00
Mans Rullgard
0a7005bebd
rtpdec_xiph: fix function return type
...
parse_packed_headers() returns either zero or a negative error code
so its return type must be signed.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-12 22:21:10 +01:00
Mans Rullgard
366484fff1
smjpeg: fix type of 'ret' variable in smjpeg_read_packet()
...
The 'ret' variable is used for negative error codes so it should
be a signed type.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-12 22:21:10 +01:00
Clément Bœsch
cdfa926415
lavf/swf: transform the swf tags define in an enum.
2012-10-12 23:15:21 +02:00
Clément Bœsch
a1d2210deb
lavf/swf: re-align after previous commit.
2012-10-12 23:15:12 +02:00
Clément Bœsch
91fad50f63
lavf/swf: define more tags.
...
Based on swf specs v10, page 271-273.
2012-10-12 23:15:08 +02:00
Clément Bœsch
cd78192d09
lavf/swfdec: return more meaningful error codes.
2012-10-12 23:15:05 +02:00
Clément Bœsch
0c40220b9d
lavf/swfdec: fix flushing with compressed swf.
...
We now only return in the middle of the refill in case of read error, so
inflate can be re-called if zlib needs an empty (z.avail_in=0) inflate
call for flushing.
2012-10-12 21:59:06 +02:00
Diego Biurrun
717addecad
Use proper return values in case of missing features
2012-10-12 20:56:54 +02:00
Diego Biurrun
930c9d4373
avutil: Duplicate ff_log2_tab instead of sharing it across libs
...
The table is so small that the space gain is not worth the
performance overhead of cross-library access.
2012-10-12 20:39:17 +02:00
Michael Niedermayer
b8d64559d5
movenc: fix timescale for timecode track
...
regression since b02493e476
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-12 20:16:48 +02:00
Heesuk Jung
e3301459f6
avidec: Use sample size in case incorrect timestamps for aac in AVI (Ticket #1755 )
...
In some case for aac in AVI, avidec extracts wrong PTS value.
(www.ffmpeg.org/trac/ffmpeg/ticket/1755)
I found additional case(ss=4096) and add condition.
Problematic file link : https://docs.google.com/open?id=0B6r7ZfWFIypCOTdZQUtGVEdJUUE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-12 17:57:35 +02:00
Michael Bradshaw
a41c824c53
Parse DEFINESOUND tags in swf (fix ticket 1638)
...
Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-12 17:37:34 +02:00
Martin Storsjö
5a2cb78219
rtspdec: Set the default port for listen mode, if none is specified
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-12 18:17:24 +03:00
Michael Niedermayer
2f1b2ff934
rtmpproto: Fix an out of array write
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-12 18:16:59 +03:00
Michael Niedermayer
eae35eadc0
rtspdec: Fix use of uninitialized byte
...
ffurl_read_complete can return 0 as well as negative error codes.
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-12 18:16:57 +03:00
Paul B Mahol
3d179edf6d
yop: check return value of avformat_new_stream()
...
Fixes null pointer dereference, fixes CID703729.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-12 14:25:00 +00:00