Martin Storsjö
31931520df
mov: Do not allow updating the time scale after it has been set
...
The time scale is set in mdhd, and later validated in the
enclosing trak atom once all of its children have been parsed.
A loose mdhd atom outside of a trak atom could update the time
scale of the last stream without any validation.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-15 21:38:58 +03:00
Martin Storsjö
5b4eb243bc
mov: Seek back if overreading an individual atom
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-15 21:37:44 +03:00
Martin Storsjö
8f24c12be7
ac3dec: Don't consume more data than the actual input packet size
...
This was handled properly in the normal return case at the end
of the function, but not in this special case.
Returning a value larger than the input packet size can cause
problems for certain library users.
Returning the actual input buffer size unconditionally, since
it is not guaranteed that frame_size is set to a sensible
value at this point.
Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-15 21:37:21 +03:00
Paul B Mahol
95126728a5
mxfenc: use ffio_fill()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-15 17:51:12 +00:00
Alexis Ballier
69383d055e
ra144enc: set supported channel layouts.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 18:04:33 +02:00
Paul B Mahol
5999db97cf
lavfi/scale: remove av_opt_free()
...
Generic code calls it already.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-15 15:27:19 +00:00
Michael Niedermayer
6158a3bcdf
avformat/matroskadec: Detect conflicting sample rate/default_duration
...
Fixes Ticket2508
Thanks-to: Moritz Bunkus
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 17:13:45 +02:00
Michael Niedermayer
3ea765b033
avfilter/avf_concat: fix AVOption flags typo
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 14:15:15 +02:00
Michael Niedermayer
fcbf16a76f
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
indeo: Reject impossible FRAMETYPE_NULL
Conflicts:
libavcodec/ivi_common.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 14:08:06 +02:00
Michael Niedermayer
c4b904caea
Merge commit 'f9e5261cab067be7278f73d515bc9b601eb56202'
...
* commit 'f9e5261cab067be7278f73d515bc9b601eb56202':
indeo: Do not reference mismatched tiles
Conflicts:
libavcodec/ivi_common.c
See: dab70c62d2
2013-07-15 13:58:38 +02:00
Michael Niedermayer
8e4ecd8774
Merge commit '28dda8a691f1c723a4a9365ab85f9625f1330096'
...
* commit '28dda8a691f1c723a4a9365ab85f9625f1330096':
indeo: Sanitize ff_ivi_init_planes fail paths
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 13:45:36 +02:00
Michael Niedermayer
e3b13c1081
Merge commit 'b0eeb9d442e4b7e82f6797d74245434ea33110a5'
...
* commit 'b0eeb9d442e4b7e82f6797d74245434ea33110a5':
indeo5: return proper error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 13:18:29 +02:00
Michael Niedermayer
1cd74a9b4d
Merge commit '25a6666f6c07c6ac8449a63d7fbce0dfd29c54cd'
...
* commit '25a6666f6c07c6ac8449a63d7fbce0dfd29c54cd':
indeo: Bound-check before applying motion compensation
The added checks and one previously added check are replaced by asserts,
the conditions can only be
true when vectors are invalid or there are worse inconsistencies.
We are checking the vectors validity and there should be no
inconsistencies, thus the checks should not be needed.
Also no files are known to cause any anomalies in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 13:13:52 +02:00
Michael Niedermayer
2fe5e3e970
Merge commit '1dd1b2332ebbac710d8e0214cec7595e118f2105'
...
* commit '1dd1b2332ebbac710d8e0214cec7595e118f2105':
rtsp: Include an User-Agent header field in all requests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 12:38:24 +02:00
Stefano Sabatini
4aa2874ab1
lavc/avcodec.h: extend documentation for AVPicture API
2013-07-15 12:24:47 +02:00
Luca Barbato
5b2a29552c
indeo: Reject impossible FRAMETYPE_NULL
...
A frame marked FRAMETYPE_NULL cannot be scalable and requires a
previous frame successfully decoded.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-15 11:46:50 +02:00
Luca Barbato
f9e5261cab
indeo: Do not reference mismatched tiles
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-15 11:46:30 +02:00
Luca Barbato
28dda8a691
indeo: Sanitize ff_ivi_init_planes fail paths
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-15 11:29:59 +02:00
Luca Barbato
b0eeb9d442
indeo5: return proper error codes
2013-07-15 11:29:59 +02:00
Luca Barbato
25a6666f6c
indeo: Bound-check before applying motion compensation
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-15 11:29:59 +02:00
Michael Niedermayer
5fe5f020b6
MAINTAINERS: drop 1.1 from the releases that i maintain
...
There seems to be no need to continue maintaining it, people can easily
upgrade to 1.2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15 02:30:36 +02:00
Paul B Mahol
85a22099a7
lavfi/stereo3d: subsampled yuv support for non-anaglyph outputs
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-14 21:57:03 +00:00
James Almer
04b9836274
oggparsevorbis: Support official chapter extension
...
Fixes ticket #1833
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 22:15:55 +02:00
Michael Niedermayer
17b98c1abd
fate: fix stereo3d
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 22:10:38 +02:00
Paul B Mahol
d5598c0963
lavfi/drawutils: set subsampling for rgb too
...
Otherwise it is incorrectly set to 1.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-14 17:59:25 +00:00
Martin Storsjö
1dd1b2332e
rtsp: Include an User-Agent header field in all requests
...
Some rtsp servers like the IP Cam IcyBox IB-CAM2002 need it.
Based on a patch by Carl Eugen Hoyos.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-14 20:53:04 +03:00
Paul B Mahol
ed448efe61
lavfi/mp: remove mp=perspective
...
The filter was ported to a native libavfilter filter.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-14 16:27:18 +00:00
Paul B Mahol
80c6445932
lavfi: port perspective filter from libmpcodecs
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-14 16:27:17 +00:00
Stefano Sabatini
ab5f581625
doc/bitstream_filters: amend name of some bitstream filters
2013-07-14 16:06:36 +02:00
Michael Niedermayer
febbddbdd5
indeo4: print an error message if ref_mb is needed but unavailable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 15:18:03 +02:00
Michael Niedermayer
76d0a6656b
indeo: print errors if transform and block size mismatch
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 14:20:42 +02:00
Michael Niedermayer
a8e5fac1fb
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
indeo: Bound-check before applying transform
Conflicts:
libavcodec/indeo4.c
libavcodec/indeo5.c
libavcodec/ivi_common.c
See: af388237090846719dd1
2013-07-14 13:37:40 +02:00
Michael Niedermayer
ccb422a697
Merge commit 'cd78e934c246d1b2510f8fba0abfe40bb75795f6'
...
* commit 'cd78e934c246d1b2510f8fba0abfe40bb75795f6':
indeo4: Validate scantable dimension
See: 92f7f1db42
2013-07-14 13:08:13 +02:00
Michael Niedermayer
8c0bb19522
Merge commit '6255ccf7d51c82ab79bf0cd47a921f572dda4489'
...
* commit '6255ccf7d51c82ab79bf0cd47a921f572dda4489':
indeo4: Check the quantization matrix index
Conflicts:
libavcodec/indeo4.c
See: 8a20774a24
2013-07-14 12:43:45 +02:00
Michael Niedermayer
5462361937
Merge commit '8435bca087c0e79385763c51de009fd89390b6a5'
...
* commit '8435bca087c0e79385763c51de009fd89390b6a5':
indeo4: Do not access missing reference MV
Conflicts:
libavcodec/indeo4.c
See: 5216245aaae44fb4
2013-07-14 12:38:54 +02:00
Michael Niedermayer
ac20ba35e3
Merge commit '031be5b41b54c3b666f31d83fe3ad41c194af8c5'
...
* commit '031be5b41b54c3b666f31d83fe3ad41c194af8c5':
ac3dec: Consistently use AC3_BLOCK_SIZE and sizeof
Conflicts:
libavcodec/ac3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 12:10:38 +02:00
Michael Niedermayer
198e10b55c
Merge commit '68e57cde68f3da4c557ca15491fda74d1ea6321e'
...
* commit '68e57cde68f3da4c557ca15491fda74d1ea6321e':
ac3dec: Increment channel pointers only once per channel
Conflicts:
libavcodec/ac3dec.c
See: 7aabeea9ba
2013-07-14 12:08:38 +02:00
Michael Niedermayer
b24e8f566d
Merge commit '886e1b36f5044d3ceccbb01f64619acaf288fb7c'
...
* commit '886e1b36f5044d3ceccbb01f64619acaf288fb7c':
jpeg2000: Remove unused passes array in Jpeg200Cblk structure
The array is left as its used by our encoder
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 11:44:23 +02:00
Michael Niedermayer
c75dde6074
swscale: call handle_format() from the functions that need it
...
This should fix some hypothetical issues with alloc/init_context() usage
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 03:36:19 +02:00
Michael Niedermayer
0fc11e7bad
swscale: make handle_formats() safe to be called multiple times
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 03:36:19 +02:00
Michael Niedermayer
d5f5e51662
swscale: move format handling to its own function
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-14 03:36:19 +02:00
Paul B Mahol
fc6ca37316
lavfi/aecho: fix invalid free
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-13 23:45:05 +00:00
Paul B Mahol
f486d7e924
lavfi/silencedetect: unbreak for unknown channel layouts
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-13 22:23:09 +00:00
Paul B Mahol
099dfcaa0e
lavfi/ashowinfo: unbreak for >8 channels
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-13 22:04:14 +00:00
Paul B Mahol
729709b890
lavfi/asetnsamples: unbreak for >8 channels
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-13 21:59:13 +00:00
Paul B Mahol
e9678631f1
lavfi/trim: fix sample copy for >8 channels
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-13 21:54:02 +00:00
Paul B Mahol
6347824d53
lavfi/showwaves: fix floating exception with >8 channels
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-13 21:46:27 +00:00
Michael Niedermayer
aac57c765f
avfilter/asrc_aevalsrc: fix cases of unknown channel layout
...
Fixes >8 channels
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-13 23:10:15 +02:00
Michael Niedermayer
f3d138ab22
avdevice/lavfi: fix input with unknown channel layout
...
Fixes handling of >8 channels
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-13 23:10:05 +02:00
Luca Barbato
dc79685195
indeo: Bound-check before applying transform
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
2013-07-13 19:11:18 +02:00
