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

2015-04-23 Thread Andreas Cadhalpun 
ffmpeg | branch: master | Andreas Cadhalpun  
| Wed Apr 22 16:03:41 2015 +0200| [58d605ee9b3277289278dc40e022311f8e083833] | 
committer: Michael Niedermayer

alsdec: only adapt order for positive max_order

For max_order = 0 the clipping range is invalid. (amin = 2, amax = 1)

Signed-off-by: Andreas Cadhalpun 
Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58d605ee9b3277289278dc40e022311f8e083833
---

 libavcodec/alsdec.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index e34cf6e..75be55c 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -682,7 +682,7 @@ static int read_var_block_data(ALSDecContext *ctx, 
ALSBlockData *bd)
 
 
 if (!sconf->rlslms) {
-if (sconf->adapt_order) {
+if (sconf->adapt_order && sconf->max_order) {
 int opt_order_length = av_ceil_log2(av_clip((bd->block_length >> 
3) - 1,
 2, sconf->max_order + 1));
 *bd->opt_order   = get_bits(gb, opt_order_length);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

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

2015-04-25 Thread Andreas Cadhalpun 
ffmpeg | branch: release/2.4 | Andreas Cadhalpun 
 | Wed Apr 22 16:03:41 2015 +0200| 
[b16a6c67099852f5c1485b70611a7803acd9a782] | committer: Michael Niedermayer

alsdec: only adapt order for positive max_order

For max_order = 0 the clipping range is invalid. (amin = 2, amax = 1)

Signed-off-by: Andreas Cadhalpun 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 58d605ee9b3277289278dc40e022311f8e083833)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b16a6c67099852f5c1485b70611a7803acd9a782
---

 libavcodec/alsdec.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 9ee33bf..a55354b 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -682,7 +682,7 @@ static int read_var_block_data(ALSDecContext *ctx, 
ALSBlockData *bd)
 
 
 if (!sconf->rlslms) {
-if (sconf->adapt_order) {
+if (sconf->adapt_order && sconf->max_order) {
 int opt_order_length = av_ceil_log2(av_clip((bd->block_length >> 
3) - 1,
 2, sconf->max_order + 1));
 *bd->opt_order   = get_bits(gb, opt_order_length);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[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
Signed-off-by: Andreas Cadhalpun 
Signed-off-by: Anton Khirnov 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60f1cc4a1ffcbf24acbb543988ceeaec76b70818
---

 libavcodec/alsdec.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index a5452c3..1ade656 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -663,7 +663,7 @@ static int read_var_block_data(ALSDecContext *ctx, 
ALSBlockData *bd)
 
 
 if (!sconf->rlslms) {
-if (sconf->adapt_order) {
+if (sconf->adapt_order && sconf->max_order) {
 int opt_order_length = av_ceil_log2(av_clip((bd->block_length >> 
3) - 1,
 2, sconf->max_order + 1));
 *bd->opt_order   = get_bits(gb, opt_order_length);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

[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.org
Signed-off-by: Andreas Cadhalpun 
Signed-off-by: Anton Khirnov 
(cherry picked from commit 60f1cc4a1ffcbf24acbb543988ceeaec76b70818)
Signed-off-by: Anton Khirnov 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=378ee3bad5b99e8f90864af9bc851590e0f64825
---

 libavcodec/alsdec.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 44857e6..997c162 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -663,7 +663,7 @@ static int read_var_block_data(ALSDecContext *ctx, 
ALSBlockData *bd)
 
 
 if (!sconf->rlslms) {
-if (sconf->adapt_order) {
+if (sconf->adapt_order && sconf->max_order) {
 int opt_order_length = av_ceil_log2(av_clip((bd->block_length >> 
3) - 1,
 2, sconf->max_order + 1));
 *bd->opt_order   = get_bits(gb, opt_order_length);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

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

2015-05-06 Thread Andreas Cadhalpun 
ffmpeg | branch: release/2.2 | Andreas Cadhalpun 
 | Wed Apr 22 16:03:41 2015 +0200| 
[eaa9693fed36c29dfbac896946de31eb186ac5d0] | 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
Signed-off-by: Andreas Cadhalpun 
Signed-off-by: Anton Khirnov 
(cherry picked from commit 60f1cc4a1ffcbf24acbb543988ceeaec76b70818)
Signed-off-by: Anton Khirnov 
(cherry picked from commit 378ee3bad5b99e8f90864af9bc851590e0f64825)
Signed-off-by: Anton Khirnov 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eaa9693fed36c29dfbac896946de31eb186ac5d0
---

 libavcodec/alsdec.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 6b0eb22..92c3b16 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -661,7 +661,7 @@ static int read_var_block_data(ALSDecContext *ctx, 
ALSBlockData *bd)
 
 
 if (!sconf->rlslms) {
-if (sconf->adapt_order) {
+if (sconf->adapt_order && sconf->max_order) {
 int opt_order_length = av_ceil_log2(av_clip((bd->block_length >> 
3) - 1,
 2, sconf->max_order + 1));
 *bd->opt_order   = get_bits(gb, opt_order_length);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

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

2015-05-06 Thread Andreas Cadhalpun 
ffmpeg | branch: release/2.2 | Andreas Cadhalpun 
 | Wed Apr 22 16:03:41 2015 +0200| 
[e93c46b3ccc1f30cd14bac6f3e4f6e4a831559c1] | committer: Michael Niedermayer

alsdec: only adapt order for positive max_order

For max_order = 0 the clipping range is invalid. (amin = 2, amax = 1)

Signed-off-by: Andreas Cadhalpun 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 58d605ee9b3277289278dc40e022311f8e083833)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e93c46b3ccc1f30cd14bac6f3e4f6e4a831559c1
---

 libavcodec/alsdec.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 1cd55ea..b5e748d 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -680,7 +680,7 @@ static int read_var_block_data(ALSDecContext *ctx, 
ALSBlockData *bd)
 
 
 if (!sconf->rlslms) {
-if (sconf->adapt_order) {
+if (sconf->adapt_order && sconf->max_order) {
 int opt_order_length = av_ceil_log2(av_clip((bd->block_length >> 
3) - 1,
 2, sconf->max_order + 1));
 *bd->opt_order   = get_bits(gb, opt_order_length);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

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

2015-05-14 Thread Andreas Cadhalpun 
ffmpeg | branch: release/2.6 | Andreas Cadhalpun 
 | Wed Apr 22 16:03:41 2015 +0200| 
[01291b4e2f4f798fe1ab60370ebfd7d7b0731aca] | committer: Andreas Cadhalpun

alsdec: only adapt order for positive max_order

For max_order = 0 the clipping range is invalid. (amin = 2, amax = 1)

Signed-off-by: Andreas Cadhalpun 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 58d605ee9b3277289278dc40e022311f8e083833)
Signed-off-by: Andreas Cadhalpun 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01291b4e2f4f798fe1ab60370ebfd7d7b0731aca
---

 libavcodec/alsdec.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 62c91ae..d9fcb1a 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -682,7 +682,7 @@ static int read_var_block_data(ALSDecContext *ctx, 
ALSBlockData *bd)
 
 
 if (!sconf->rlslms) {
-if (sconf->adapt_order) {
+if (sconf->adapt_order && sconf->max_order) {
 int opt_order_length = av_ceil_log2(av_clip((bd->block_length >> 
3) - 1,
 2, sconf->max_order + 1));
 *bd->opt_order   = get_bits(gb, opt_order_length);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

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

2015-05-21 Thread Andreas Cadhalpun 
ffmpeg | branch: release/2.5 | Andreas Cadhalpun 
 | Wed Apr 22 16:03:41 2015 +0200| 
[216ef1200a68ad4af5da35f38dc928b31141a5c6] | committer: Michael Niedermayer

alsdec: only adapt order for positive max_order

For max_order = 0 the clipping range is invalid. (amin = 2, amax = 1)

Signed-off-by: Andreas Cadhalpun 
Signed-off-by: Michael Niedermayer 
(cherry picked from commit 58d605ee9b3277289278dc40e022311f8e083833)

Signed-off-by: Michael Niedermayer 

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=216ef1200a68ad4af5da35f38dc928b31141a5c6
---

 libavcodec/alsdec.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 9ee33bf..a55354b 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -682,7 +682,7 @@ static int read_var_block_data(ALSDecContext *ctx, 
ALSBlockData *bd)
 
 
 if (!sconf->rlslms) {
-if (sconf->adapt_order) {
+if (sconf->adapt_order && sconf->max_order) {
 int opt_order_length = av_ceil_log2(av_clip((bd->block_length >> 
3) - 1,
 2, sconf->max_order + 1));
 *bd->opt_order   = get_bits(gb, opt_order_length);

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog