virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

Add support for FLAC's new RICE2 entropy coding method. Patch by Josh Coalson.

Browse Source 
Originally committed as revision 10915 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Josh Coalson
2007-11-03 23:54:50 +00:00
committed by Justin Ruggles
parent 9abf243316
commit e471443ab5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/flac.c
View File

@ -217,7 +217,7 @@ static int decode_residuals(FLACContext *s, int channel, int pred_order)
int sample = 0, samples; int sample = 0, samples;
method_type = get_bits(&s->gb, 2); method_type = get_bits(&s->gb, 2);
if (method_type != 0){ if (method_type > 1){
av_log(s->avctx, AV_LOG_DEBUG, "illegal residual coding method %d\n", method_type); av_log(s->avctx, AV_LOG_DEBUG, "illegal residual coding method %d\n", method_type);
return -1; return -1;
} }
@ -234,8 +234,8 @@ static int decode_residuals(FLACContext *s, int channel, int pred_order)
i= pred_order; i= pred_order;
for (partition = 0; partition < (1 << rice_order); partition++) for (partition = 0; partition < (1 << rice_order); partition++)
{ {
tmp = get_bits(&s->gb, 4); tmp = get_bits(&s->gb, method_type == 0 ? 4 : 5);
if (tmp == 15) if (tmp == (method_type == 0 ? 15 : 31))
{ {
av_log(s->avctx, AV_LOG_DEBUG, "fixed len partition\n"); av_log(s->avctx, AV_LOG_DEBUG, "fixed len partition\n");
tmp = get_bits(&s->gb, 5); tmp = get_bits(&s->gb, 5);