summaryrefslogtreecommitdiff
path: root/libavcodec/ac3_parser.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-04-19 12:04:33 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-04-19 12:04:33 +0000
commit144b5bdc70ce1ea969be96f558e280810d19cdcf (patch)
treedd75456e1a20760e50e36aae5a3650148e65d2c2 /libavcodec/ac3_parser.c
parent8870cf8277e4163bf94767a0c248214f218bd381 (diff)
downloadffmpeg-144b5bdc70ce1ea969be96f558e280810d19cdcf.tar.gz
Make most of E-AC-3 work without breaking regression tests.
Originally committed as revision 12903 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ac3_parser.c')
-rw-r--r--libavcodec/ac3_parser.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c
index 63b5c39b46..f0b640dc4a 100644
--- a/libavcodec/ac3_parser.c
+++ b/libavcodec/ac3_parser.c
@@ -84,7 +84,7 @@ int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr)
hdr->bit_rate = (ff_ac3_bitrate_tab[frame_size_code>>1] * 1000) >> hdr->sr_shift;
hdr->channels = ff_ac3_channels_tab[hdr->channel_mode] + hdr->lfe_on;
hdr->frame_size = ff_ac3_frame_size_tab[frame_size_code][hdr->sr_code] * 2;
- hdr->frame_type = EAC3_FRAME_TYPE_INDEPENDENT;
+ hdr->frame_type = EAC3_FRAME_TYPE_AC3_CONVERT; //EAC3_FRAME_TYPE_INDEPENDENT;
} else {
/* Enhanced AC-3 */
hdr->crc1 = 0;
@@ -140,8 +140,8 @@ static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info,
hdr_info->channels = hdr.channels;
hdr_info->samples = AC3_FRAME_SIZE;
- *need_next_header = 0;//(hdr.frame_type != EAC3_FRAME_TYPE_AC3_CONVERT);
- *new_frame_start = 1;//(hdr.frame_type != EAC3_FRAME_TYPE_DEPENDENT);
+ *need_next_header = (hdr.frame_type != EAC3_FRAME_TYPE_AC3_CONVERT);
+ *new_frame_start = (hdr.frame_type != EAC3_FRAME_TYPE_DEPENDENT);
return hdr.frame_size;
}