Re: [FFmpeg-cvslog] ffplay&cmdutils:Factor get_rotation() code out

2015-05-05 Thread Michael Niedermayer
On Tue, May 05, 2015 at 11:31:20AM +0800, Geek.Song wrote: > commit f2f2a6950ba28df78343fa25dbdd18e1ddbf0f7c > Author: GoogleGeek > Date: Mon May 4 14:40:02 2015 +0800 > > fix link when avdevice is disabled fixed by James Almer thanks to all [...] -- Michael GnuPG fingerprint: 9FF21

[FFmpeg-cvslog] Merge commit '8b86c2ed2eb29dce137b26e66a9bddd50f72817f' into release/2.4

2015-05-05 Thread Michael Niedermayer
ffmpeg | branch: release/2.4 | Michael Niedermayer | Wed May 6 03:48:31 2015 +0200| [f28d3f98c5bb09d748e49cb851f043927c7b11cb] | committer: Michael Niedermayer Merge commit '8b86c2ed2eb29dce137b26e66a9bddd50f72817f' into release/2.4 * commit '8b86c2ed2eb29dce137b26e66a9bddd50f72817f': Rever

[FFmpeg-cvslog] Revert "lavfi: always check av_expr_parse_and_eval() return value"

2015-05-05 Thread Anton Khirnov
ffmpeg | branch: release/2.4 | Anton Khirnov | Sat May 2 09:09:52 2015 +0200| [8b86c2ed2eb29dce137b26e66a9bddd50f72817f] | committer: Anton Khirnov Revert "lavfi: always check av_expr_parse_and_eval() return value" This reverts commit 63be97ec403023fb664798432acedaf6e6922527. All those calls

[FFmpeg-cvslog] alsdec: check sample pointer range in revert_channel_correlation

2015-05-05 Thread Andreas Cadhalpun
ffmpeg | branch: release/2.4 | Andreas Cadhalpun | Tue Apr 21 19:28:30 2015 +0200| [41a89cba6086de2bd24f9ec7e21200fa162505e9] | committer: Anton Khirnov alsdec: check sample pointer range in revert_channel_correlation Also change the type of begin, end and smp to ptrdiff_t to make the comparis

[FFmpeg-cvslog] alsdec: only adapt order for positive max_order

2015-05-05 Thread Andreas Cadhalpun
ffmpeg | branch: release/2.4 | Andreas Cadhalpun | Wed Apr 22 16:03:41 2015 +0200| [378ee3bad5b99e8f90864af9bc851590e0f64825] | committer: Anton Khirnov alsdec: only adapt order for positive max_order For max_order = 0 the clipping range is invalid. (amin = 2, amax = 1) CC: libav-sta...@libav

[FFmpeg-cvslog] Merge commit '41a89cba6086de2bd24f9ec7e21200fa162505e9' into release/2.4

2015-05-05 Thread Michael Niedermayer
ffmpeg | branch: release/2.4 | Michael Niedermayer | Wed May 6 03:34:04 2015 +0200| [843b860ad974752ef3fe00c75081c3bda3b56a97] | committer: Michael Niedermayer Merge commit '41a89cba6086de2bd24f9ec7e21200fa162505e9' into release/2.4 * commit '41a89cba6086de2bd24f9ec7e21200fa162505e9': alsde

[FFmpeg-cvslog] Merge commit '378ee3bad5b99e8f90864af9bc851590e0f64825' into release/2.4

2015-05-05 Thread Michael Niedermayer
ffmpeg | branch: release/2.4 | Michael Niedermayer | Wed May 6 03:34:45 2015 +0200| [146648771c953cf50d98617eaa250ebdf423ffaf] | committer: Michael Niedermayer Merge commit '378ee3bad5b99e8f90864af9bc851590e0f64825' into release/2.4 * commit '378ee3bad5b99e8f90864af9bc851590e0f64825': alsde

[FFmpeg-cvslog] aacpsy: correct calculation of minath in psy_3gpp_init

2015-05-05 Thread Andreas Cadhalpun
ffmpeg | branch: release/2.4 | Andreas Cadhalpun | Tue Apr 21 18:43:55 2015 +0200| [7b66cf5ce7fdb8b3fa13459aab3f4d6ab559f1ea] | committer: Anton Khirnov aacpsy: correct calculation of minath in psy_3gpp_init The minimum of the ath(x, ATH_ADD) function depends on ATH_ADD. This patch uses the fi

[FFmpeg-cvslog] Merge commit '7b66cf5ce7fdb8b3fa13459aab3f4d6ab559f1ea' into release/2.4

2015-05-05 Thread Michael Niedermayer
ffmpeg | branch: release/2.4 | Michael Niedermayer | Wed May 6 03:20:42 2015 +0200| [97d7c8d5848899797ce657f50a1f7aa49c2955cd] | committer: Michael Niedermayer Merge commit '7b66cf5ce7fdb8b3fa13459aab3f4d6ab559f1ea' into release/2.4 * commit '7b66cf5ce7fdb8b3fa13459aab3f4d6ab559f1ea': aacps

[FFmpeg-cvslog] alsdec: limit avctx->bits_per_raw_sample to 32

2015-05-05 Thread Andreas Cadhalpun
ffmpeg | branch: release/2.4 | Andreas Cadhalpun | Sat Apr 18 20:29:13 2015 +0200| [1cb470934a26a6e73c61a2cc36f0d5063bdced29] | committer: Michael Niedermayer alsdec: limit avctx->bits_per_raw_sample to 32 avctx->bits_per_raw_sample is used in get_sbits_long, which only supports up to 32 bits.

[FFmpeg-cvslog] Merge commit '0d3a7dd26490156b607541dd2e1faeaa0fc61a88' into release/2.4

2015-05-05 Thread Michael Niedermayer
ffmpeg | branch: release/2.4 | Michael Niedermayer | Wed May 6 03:06:55 2015 +0200| [4ba11b944e46e6d53bce3f5869e1d4edc31f8c3d] | committer: Michael Niedermayer Merge commit '0d3a7dd26490156b607541dd2e1faeaa0fc61a88' into release/2.4 * commit '0d3a7dd26490156b607541dd2e1faeaa0fc61a88': aasc:

[FFmpeg-cvslog] alsdec: limit avctx->bits_per_raw_sample to 32

2015-05-05 Thread Andreas Cadhalpun
ffmpeg | branch: release/2.4 | Andreas Cadhalpun | Sat Apr 18 20:29:13 2015 +0200| [97010c74cbff177b58daf9a092b4e37a7da26f85] | committer: Anton Khirnov alsdec: limit avctx->bits_per_raw_sample to 32 avctx->bits_per_raw_sample is used in get_sbits_long, which only supports up to 32 bits. CC:

[FFmpeg-cvslog] aasc: return correct buffer size from aasc_decode_frame

2015-05-05 Thread Andreas Cadhalpun
ffmpeg | branch: release/2.4 | Andreas Cadhalpun | Thu Apr 16 19:12:02 2015 +0200| [0d3a7dd26490156b607541dd2e1faeaa0fc61a88] | committer: Anton Khirnov aasc: return correct buffer size from aasc_decode_frame CC: libav-sta...@libav.org Signed-off-by: Andreas Cadhalpun Signed-off-by: Anton Khi

[FFmpeg-cvslog] Merge commit '97010c74cbff177b58daf9a092b4e37a7da26f85' into release/2.4

2015-05-05 Thread Michael Niedermayer
ffmpeg | branch: release/2.4 | Michael Niedermayer | Wed May 6 03:09:49 2015 +0200| [8d3a967635c321df4c0cc9e99988719b3349429b] | committer: Michael Niedermayer Merge commit '97010c74cbff177b58daf9a092b4e37a7da26f85' into release/2.4 * commit '97010c74cbff177b58daf9a092b4e37a7da26f85': alsde

[FFmpeg-cvslog] avcodec/diracdec: Fix types and wraparounds in dirac_decode_picture_header ()

2015-05-05 Thread Michael Niedermayer
ffmpeg | branch: master | Michael Niedermayer | Wed May 6 02:44:21 2015 +0200| [a2190de52d6c519021e81a21f5e70598fe1c9f8a] | committer: Michael Niedermayer avcodec/diracdec: Fix types and wraparounds in dirac_decode_picture_header() previously various variables had a too small type to support

[FFmpeg-cvslog] diracdec: check if reference could not be allocated

2015-05-05 Thread Andreas Cadhalpun
ffmpeg | branch: master | Andreas Cadhalpun | Tue May 5 23:51:48 2015 +0200| [d93181ef3eacdb862d93448f31c97765a523d1db] | committer: Michael Niedermayer diracdec: check if reference could not be allocated s->ref_pics[i] is later used as ref argument of interpolate_refplane, where it is derefe

[FFmpeg-cvslog] diracdec: avoid overflow of bytes*8 in decode_lowdelay

2015-05-05 Thread Andreas Cadhalpun
ffmpeg | branch: master | Andreas Cadhalpun | Tue May 5 22:10:44 2015 +0200| [9e66b39aa87eb653a6e5d15f70b792ccbf719de7] | committer: Michael Niedermayer diracdec: avoid overflow of bytes*8 in decode_lowdelay If bytes is large enough, bytes*8 can overflow and become negative. In that case 'bu

[FFmpeg-cvslog] Revert "lavfi: always check av_expr_parse_and_eval() return value"

2015-05-05 Thread Anton Khirnov
ffmpeg | branch: master | Anton Khirnov | Sat May 2 09:09:52 2015 +0200| [3735b5c616770429572f86aabdaec39c6ebb8818] | committer: Anton Khirnov Revert "lavfi: always check av_expr_parse_and_eval() return value" This reverts commit 63be97ec403023fb664798432acedaf6e6922527. All those calls were

[FFmpeg-cvslog] Merge commit '3735b5c616770429572f86aabdaec39c6ebb8818'

2015-05-05 Thread Michael Niedermayer
ffmpeg | branch: master | Michael Niedermayer | Tue May 5 23:21:24 2015 +0200| [af6739d6daf747778996c832a1d8b933cab03dd3] | committer: Michael Niedermayer Merge commit '3735b5c616770429572f86aabdaec39c6ebb8818' * commit '3735b5c616770429572f86aabdaec39c6ebb8818': Revert "lavfi: always check

[FFmpeg-cvslog] lavf/riff: Add MultiScope II fourcc MSC2 as MJPEG.

2015-05-05 Thread Carl Eugen Hoyos
ffmpeg | branch: master | Carl Eugen Hoyos | Tue May 5 23:51:20 2015 +0200| [e31cdb5cc8080e164c66838a69f37f60f2d0ea82] | committer: Carl Eugen Hoyos lavf/riff: Add MultiScope II fourcc MSC2 as MJPEG. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e31cdb5cc8080e164c66838a69f37f60f

[FFmpeg-cvslog] alsdec: only adapt order for positive max_order

2015-05-05 Thread Andreas Cadhalpun
ffmpeg | branch: master | Andreas Cadhalpun | Wed Apr 22 16:03:41 2015 +0200| [60f1cc4a1ffcbf24acbb543988ceeaec76b70818] | committer: Anton Khirnov alsdec: only adapt order for positive max_order For max_order = 0 the clipping range is invalid. (amin = 2, amax = 1) CC: libav-sta...@libav.org

[FFmpeg-cvslog] Merge commit '60f1cc4a1ffcbf24acbb543988ceeaec76b70818'

2015-05-05 Thread Michael Niedermayer
ffmpeg | branch: master | Michael Niedermayer | Tue May 5 22:57:12 2015 +0200| [1ace789fb344fcc571503f2246f542eeb62bd865] | committer: Michael Niedermayer Merge commit '60f1cc4a1ffcbf24acbb543988ceeaec76b70818' * commit '60f1cc4a1ffcbf24acbb543988ceeaec76b70818': alsdec: only adapt order fo

[FFmpeg-cvslog] alsdec: check sample pointer range in revert_channel_correlation

2015-05-05 Thread Andreas Cadhalpun
ffmpeg | branch: master | Andreas Cadhalpun | Tue Apr 21 19:28:30 2015 +0200| [94bb1ce882a12b6d7a1fa32715a68121b39ee838] | committer: Anton Khirnov alsdec: check sample pointer range in revert_channel_correlation Also change the type of begin, end and smp to ptrdiff_t to make the comparison we

[FFmpeg-cvslog] Merge commit '94bb1ce882a12b6d7a1fa32715a68121b39ee838'

2015-05-05 Thread Michael Niedermayer
ffmpeg | branch: master | Michael Niedermayer | Tue May 5 22:55:45 2015 +0200| [ff849e11e361a8e5161cf4f2896acfeeec1caeef] | committer: Michael Niedermayer Merge commit '94bb1ce882a12b6d7a1fa32715a68121b39ee838' * commit '94bb1ce882a12b6d7a1fa32715a68121b39ee838': alsdec: check sample pointe

[FFmpeg-cvslog] Merge commit '110f7f35fb615b97d983b1c6c6a714fddd28bcbe'

2015-05-05 Thread Michael Niedermayer
ffmpeg | branch: master | Michael Niedermayer | Tue May 5 22:45:30 2015 +0200| [9810aa340842621d72bb46ec880260a7bf1da1b9] | committer: Michael Niedermayer Merge commit '110f7f35fb615b97d983b1c6c6a714fddd28bcbe' * commit '110f7f35fb615b97d983b1c6c6a714fddd28bcbe': aacpsy: correct calculation

[FFmpeg-cvslog] aacpsy: correct calculation of minath in psy_3gpp_init

2015-05-05 Thread Andreas Cadhalpun
ffmpeg | branch: master | Andreas Cadhalpun | Tue Apr 21 18:43:55 2015 +0200| [110f7f35fb615b97d983b1c6c6a714fddd28bcbe] | committer: Anton Khirnov aacpsy: correct calculation of minath in psy_3gpp_init The minimum of the ath(x, ATH_ADD) function depends on ATH_ADD. This patch uses the first o

[FFmpeg-cvslog] Merge commit 'e191aaca44b986816695e3b7ecfae64697fd6631'

2015-05-05 Thread Michael Niedermayer
ffmpeg | branch: master | Michael Niedermayer | Tue May 5 22:32:57 2015 +0200| [df95281618459fdf992e9a9a4da5b84a2b4f0c1b] | committer: Michael Niedermayer Merge commit 'e191aaca44b986816695e3b7ecfae64697fd6631' * commit 'e191aaca44b986816695e3b7ecfae64697fd6631': alsdec: limit avctx->bits_p

[FFmpeg-cvslog] alsdec: limit avctx->bits_per_raw_sample to 32

2015-05-05 Thread Andreas Cadhalpun
ffmpeg | branch: master | Andreas Cadhalpun | Sat Apr 18 20:29:13 2015 +0200| [e191aaca44b986816695e3b7ecfae64697fd6631] | committer: Anton Khirnov alsdec: limit avctx->bits_per_raw_sample to 32 avctx->bits_per_raw_sample is used in get_sbits_long, which only supports up to 32 bits. CC: libav

[FFmpeg-cvslog] Merge commit '8fc8024ea56e814cd257d5fe27b21a865080782f'

2015-05-05 Thread Michael Niedermayer
ffmpeg | branch: master | Michael Niedermayer | Tue May 5 22:20:02 2015 +0200| [54d985db847bb3b9b9a45790bc9343c4afe0b14e] | committer: Michael Niedermayer Merge commit '8fc8024ea56e814cd257d5fe27b21a865080782f' * commit '8fc8024ea56e814cd257d5fe27b21a865080782f': aasc: return correct buffer

[FFmpeg-cvslog] aasc: return correct buffer size from aasc_decode_frame

2015-05-05 Thread Andreas Cadhalpun
ffmpeg | branch: master | Andreas Cadhalpun | Thu Apr 16 19:12:02 2015 +0200| [8fc8024ea56e814cd257d5fe27b21a865080782f] | committer: Anton Khirnov aasc: return correct buffer size from aasc_decode_frame CC: libav-sta...@libav.org Signed-off-by: Andreas Cadhalpun Signed-off-by: Anton Khirnov

[FFmpeg-cvslog] avcodec/diracdec: Move buf[] read after size check

2015-05-05 Thread Michael Niedermayer
ffmpeg | branch: master | Michael Niedermayer | Tue May 5 22:01:58 2015 +0200| [5a455dd011151fd7e3f8aced745b206ca1413d29] | committer: Michael Niedermayer avcodec/diracdec: Move buf[] read after size check Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a

[FFmpeg-cvslog] diracdec: prevent overflow in data_unit_size check

2015-05-05 Thread Andreas Cadhalpun
ffmpeg | branch: master | Andreas Cadhalpun | Tue May 5 21:33:08 2015 +0200| [984f50deb2d48f6844d65e10991b996a6d29e87c] | committer: Michael Niedermayer diracdec: prevent overflow in data_unit_size check buf_idx + data_unit_size can overflow, causing the '> buf_size' check to wrongly fail. T

[FFmpeg-cvslog] vp9: error out if chroma subsampling changes between frames.

2015-05-05 Thread Ronald S. Bultje
ffmpeg | branch: master | Ronald S. Bultje | Tue May 5 08:26:50 2015 -0400| [ed68fccf76b489c64814a481bee16ac7fe717c24] | committer: Michael Niedermayer vp9: error out if chroma subsampling changes between frames. This can happen after an intra-only frame. For reference, see: https://groups.go

[FFmpeg-cvslog] avformat/mux: Add avoid_negative_ts_use_pts

2015-05-05 Thread Michael Niedermayer
ffmpeg | branch: master | Michael Niedermayer | Tue May 5 12:44:20 2015 +0200| [7ac5c38ec5baeea6ad647ccc9bb7e97564c50ec2] | committer: Michael Niedermayer avformat/mux: Add avoid_negative_ts_use_pts This allows using pts instead of dts for negative TS avoidance Signed-off-by: Michael Niederm

[FFmpeg-cvslog] avformat/matroskaenc: Use avoid_negative_ts_use_pts if no stream writes dts

2015-05-05 Thread Michael Niedermayer
ffmpeg | branch: master | Michael Niedermayer | Tue May 5 12:57:24 2015 +0200| [9d4fdfe24c731d1880797dee65365154b41c1dea] | committer: Michael Niedermayer avformat/matroskaenc: Use avoid_negative_ts_use_pts if no stream writes dts This reduces the number of cases where timestamps need to be s

[FFmpeg-cvslog] cmdutils: Add libm.h for round()

2015-05-05 Thread Michael Niedermayer
ffmpeg | branch: master | Michael Niedermayer | Tue May 5 11:49:44 2015 +0200| [36993527dd3db4d0209cc7b37dc0f80b0fe65a71] | committer: Michael Niedermayer cmdutils: Add libm.h for round() Found-by: jamrial Signed-off-by: Michael Niedermayer > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a