[FFmpeg-cvslog] r24103 - trunk/libavcodec/ac3_parser.c

[jbr]

Author: jbr
Date: Thu Jul  8 01:52:24 2010
New Revision: 24103

Log:
ac3: make the value of codec_id during (E-)AC-3 parsing stay CODEC_ID_EAC3
if any E-AC-3 frames have been detected instead of switching back and forth for
AC-3 core + dependent E-AC-3 substream(s).
Fixes Issue 2022.

Modified:
   trunk/libavcodec/ac3_parser.c

Modified: trunk/libavcodec/ac3_parser.c
==============================================================================
--- trunk/libavcodec/ac3_parser.c	Thu Jul  8 01:47:48 2010	(r24102)
+++ trunk/libavcodec/ac3_parser.c	Thu Jul  8 01:52:24 2010	(r24103)
@@ -181,7 +181,7 @@ static int ac3_sync(uint64_t state, AACA
     hdr_info->samples = hdr.num_blocks * 256;
     if(hdr.bitstream_id>10)
         hdr_info->codec_id = CODEC_ID_EAC3;
-    else
+    else if (hdr_info->codec_id == CODEC_ID_NONE)
         hdr_info->codec_id = CODEC_ID_AC3;
 
     *need_next_header = (hdr.frame_type != EAC3_FRAME_TYPE_AC3_CONVERT);