[FFmpeg-cvslog] alac: Reject rice_limit 0 if compression is used
ffmpeg | branch: release/2.2 | Andreas Cadhalpun
andreas.cadhal...@googlemail.com | Fri Apr 24 00:01:43 2015 +0200|
[1dcb68c02a55648facb82c0b2b6a1eb3dc18f988] | committer: Reinhard Tartler
alac: Reject rice_limit 0 if compression is used
If in compression mode rice_limit = 0 leads to call
`show_bits(gb, k)` in `decode_scalar` with k = 0.
Request a sample in case it is valid and it should be accepted.
Signed-off-by: Luca Barbato lu_z...@gentoo.org
CC: libav-sta...@libav.org
(cherry picked from commit cb5324200ccdc693dd5b28dcd7d4b722fad83ea2)
Signed-off-by: Reinhard Tartler siret...@tauware.de
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1dcb68c02a55648facb82c0b2b6a1eb3dc18f988
---
libavcodec/alac.c |6 ++
1 file changed, 6 insertions(+)
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index f972531..7c2b925 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -305,6 +305,12 @@ static int decode_element(AVCodecContext *avctx, AVFrame
*frame, int ch_index,
int lpc_quant[2];
int rice_history_mult[2];
+if (!alac-rice_limit) {
+avpriv_request_sample(alac-avctx,
+ Compression with rice limit 0);
+return AVERROR(ENOSYS);
+}
+
decorr_shift = get_bits(alac-gb, 8);
decorr_left_weight = get_bits(alac-gb, 8);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] alac: reject rice_limit 0 if compression is used
ffmpeg | branch: release/2.2 | Andreas Cadhalpun
andreas.cadhal...@googlemail.com | Fri Apr 24 00:01:43 2015 +0200|
[6443db085a192baf1ede12ca80e2bbd7be3ca4fc] | committer: Michael Niedermayer
alac: reject rice_limit 0 if compression is used
If rice_limit is 0, k can be 0 in decode_scalar, which calls show_bits(gb, k).
Signed-off-by: Andreas Cadhalpun andreas.cadhal...@googlemail.com
Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit 4b657a1b1eedcf38bcf36e89a2f4be6f76b5ce09)
Signed-off-by: Michael Niedermayer michae...@gmx.at
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6443db085a192baf1ede12ca80e2bbd7be3ca4fc
---
libavcodec/alac.c |5 +
1 file changed, 5 insertions(+)
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 1e28efd..37dcc3a 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -311,6 +311,11 @@ static int decode_element(AVCodecContext *avctx, AVFrame
*frame, int ch_index,
int lpc_quant[2];
int rice_history_mult[2];
+if (!alac-rice_limit) {
+avpriv_request_sample(alac-avctx, Compression with rice limit
0);
+return AVERROR(ENOSYS);
+}
+
decorr_shift = get_bits(alac-gb, 8);
decorr_left_weight = get_bits(alac-gb, 8);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] alac: reject rice_limit 0 if compression is used
ffmpeg | branch: release/2.5 | Andreas Cadhalpun
andreas.cadhal...@googlemail.com | Fri Apr 24 00:01:43 2015 +0200|
[4c01572a9480da7d4a7d7c3fd850cc23e94d6ca1] | committer: Michael Niedermayer
alac: reject rice_limit 0 if compression is used
If rice_limit is 0, k can be 0 in decode_scalar, which calls show_bits(gb, k).
Signed-off-by: Andreas Cadhalpun andreas.cadhal...@googlemail.com
Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit 4b657a1b1eedcf38bcf36e89a2f4be6f76b5ce09)
Signed-off-by: Michael Niedermayer michae...@gmx.at
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4c01572a9480da7d4a7d7c3fd850cc23e94d6ca1
---
libavcodec/alac.c |5 +
1 file changed, 5 insertions(+)
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index aec7bb4..f5a5b86 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -316,6 +316,11 @@ static int decode_element(AVCodecContext *avctx, AVFrame
*frame, int ch_index,
int lpc_quant[2];
int rice_history_mult[2];
+if (!alac-rice_limit) {
+avpriv_request_sample(alac-avctx, Compression with rice limit
0);
+return AVERROR(ENOSYS);
+}
+
decorr_shift = get_bits(alac-gb, 8);
decorr_left_weight = get_bits(alac-gb, 8);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] alac: reject rice_limit 0 if compression is used
ffmpeg | branch: release/2.6 | Andreas Cadhalpun
andreas.cadhal...@googlemail.com | Fri Apr 24 00:01:43 2015 +0200|
[47f5f6b2303baf3e5e1e5acfee5bbe927be56f8e] | committer: Andreas Cadhalpun
alac: reject rice_limit 0 if compression is used
If rice_limit is 0, k can be 0 in decode_scalar, which calls show_bits(gb, k).
Signed-off-by: Andreas Cadhalpun andreas.cadhal...@googlemail.com
Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit 4b657a1b1eedcf38bcf36e89a2f4be6f76b5ce09)
Signed-off-by: Andreas Cadhalpun andreas.cadhal...@googlemail.com
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47f5f6b2303baf3e5e1e5acfee5bbe927be56f8e
---
libavcodec/alac.c |5 +
1 file changed, 5 insertions(+)
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index ffd2d77..ada7c73 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -316,6 +316,11 @@ static int decode_element(AVCodecContext *avctx, AVFrame
*frame, int ch_index,
int lpc_quant[2];
int rice_history_mult[2];
+if (!alac-rice_limit) {
+avpriv_request_sample(alac-avctx, Compression with rice limit
0);
+return AVERROR(ENOSYS);
+}
+
decorr_shift = get_bits(alac-gb, 8);
decorr_left_weight = get_bits(alac-gb, 8);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] alac: Reject rice_limit 0 if compression is used
ffmpeg | branch: master | Andreas Cadhalpun andreas.cadhal...@googlemail.com
| Fri Apr 24 00:01:43 2015 +0200| [243e8443cd9e83c887e3f5edf09a169e7783d14e] |
committer: Luca Barbato
alac: Reject rice_limit 0 if compression is used
If in compression mode rice_limit = 0 leads to call
`show_bits(gb, k)` in `decode_scalar` with k = 0.
Request a sample in case it is valid and it should be accepted.
Signed-off-by: Luca Barbato lu_z...@gentoo.org
CC: libav-sta...@libav.org
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=243e8443cd9e83c887e3f5edf09a169e7783d14e
---
libavcodec/alac.c |6 ++
1 file changed, 6 insertions(+)
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 48903a6..9579e18 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -307,6 +307,12 @@ static int decode_element(AVCodecContext *avctx, AVFrame
*frame, int ch_index,
int lpc_quant[2];
int rice_history_mult[2];
+if (!alac-rice_limit) {
+avpriv_request_sample(alac-avctx,
+ Compression with rice limit 0);
+return AVERROR(ENOSYS);
+}
+
decorr_shift = get_bits(alac-gb, 8);
decorr_left_weight = get_bits(alac-gb, 8);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] alac: reject rice_limit 0 if compression is used
ffmpeg | branch: release/2.4 | Andreas Cadhalpun
andreas.cadhal...@googlemail.com | Fri Apr 24 00:01:43 2015 +0200|
[dfe37f2be202a0db5b1b06552ea2aaf33eb70628] | committer: Michael Niedermayer
alac: reject rice_limit 0 if compression is used
If rice_limit is 0, k can be 0 in decode_scalar, which calls show_bits(gb, k).
Signed-off-by: Andreas Cadhalpun andreas.cadhal...@googlemail.com
Signed-off-by: Michael Niedermayer michae...@gmx.at
(cherry picked from commit 4b657a1b1eedcf38bcf36e89a2f4be6f76b5ce09)
Signed-off-by: Michael Niedermayer michae...@gmx.at
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dfe37f2be202a0db5b1b06552ea2aaf33eb70628
---
libavcodec/alac.c |5 +
1 file changed, 5 insertions(+)
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index aec7bb4..f5a5b86 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -316,6 +316,11 @@ static int decode_element(AVCodecContext *avctx, AVFrame
*frame, int ch_index,
int lpc_quant[2];
int rice_history_mult[2];
+if (!alac-rice_limit) {
+avpriv_request_sample(alac-avctx, Compression with rice limit
0);
+return AVERROR(ENOSYS);
+}
+
decorr_shift = get_bits(alac-gb, 8);
decorr_left_weight = get_bits(alac-gb, 8);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
[FFmpeg-cvslog] alac: reject rice_limit 0 if compression is used
ffmpeg | branch: master | Andreas Cadhalpun andreas.cadhal...@googlemail.com
| Fri Apr 24 00:01:43 2015 +0200| [4b657a1b1eedcf38bcf36e89a2f4be6f76b5ce09] |
committer: Michael Niedermayer
alac: reject rice_limit 0 if compression is used
If rice_limit is 0, k can be 0 in decode_scalar, which calls show_bits(gb, k).
Signed-off-by: Andreas Cadhalpun andreas.cadhal...@googlemail.com
Signed-off-by: Michael Niedermayer michae...@gmx.at
http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4b657a1b1eedcf38bcf36e89a2f4be6f76b5ce09
---
libavcodec/alac.c |5 +
1 file changed, 5 insertions(+)
diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index ffd2d77..ada7c73 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -316,6 +316,11 @@ static int decode_element(AVCodecContext *avctx, AVFrame
*frame, int ch_index,
int lpc_quant[2];
int rice_history_mult[2];
+if (!alac-rice_limit) {
+avpriv_request_sample(alac-avctx, Compression with rice limit
0);
+return AVERROR(ENOSYS);
+}
+
decorr_shift = get_bits(alac-gb, 8);
decorr_left_weight = get_bits(alac-gb, 8);
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
