comparison wavpack.c @ 5538:33a32de3c1bc libavcodec

Rename flag for consistency with the next commit
author kostya
date Mon, 13 Aug 2007 05:35:48 +0000
parents 37bf17e052fb
children 1c67999f81c8
comparison
equal deleted inserted replaced
5537:3d10c3e84f96 5538:33a32de3c1bc
25 /** 25 /**
26 * @file wavpack.c 26 * @file wavpack.c
27 * WavPack lossless audio decoder 27 * WavPack lossless audio decoder
28 */ 28 */
29 29
30 #define WV_JOINT 0x0010 30 #define WV_JOINT_STEREO 0x00000010
31 31
32 enum WP_ID_Flags{ 32 enum WP_ID_Flags{
33 WP_IDF_MASK = 0x1F, 33 WP_IDF_MASK = 0x1F,
34 WP_IDF_IGNORE = 0x20, 34 WP_IDF_IGNORE = 0x20,
35 WP_IDF_ODD = 0x40, 35 WP_IDF_ODD = 0x40,
396 /* should not happen but who knows */ 396 /* should not happen but who knows */
397 if(s->samples * 2 * avctx->channels > *data_size){ 397 if(s->samples * 2 * avctx->channels > *data_size){
398 av_log(avctx, AV_LOG_ERROR, "Packet size is too big to be handled in lavc!\n"); 398 av_log(avctx, AV_LOG_ERROR, "Packet size is too big to be handled in lavc!\n");
399 return -1; 399 return -1;
400 } 400 }
401 s->joint = AV_RL32(buf) & WV_JOINT; buf += 4; 401 s->joint = AV_RL32(buf) & WV_JOINT_STEREO; buf += 4;
402 s->CRC = AV_RL32(buf); buf += 4; 402 s->CRC = AV_RL32(buf); buf += 4;
403 // parse metadata blocks 403 // parse metadata blocks
404 while(buf < buf_end){ 404 while(buf < buf_end){
405 id = *buf++; 405 id = *buf++;
406 size = *buf++; 406 size = *buf++;