[FFmpeg-cvslog] r24136 - in branches/0.6: . libavcodec/ac3_parser.c

[siretart]

Author: siretart
Date: Fri Jul  9 03:16:42 2010
New Revision: 24136

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.

backport r24103 by jbr

Modified:
   branches/0.6/   (props changed)
   branches/0.6/libavcodec/ac3_parser.c

Modified: branches/0.6/libavcodec/ac3_parser.c
==============================================================================
--- branches/0.6/libavcodec/ac3_parser.c	Fri Jul  9 02:40:55 2010	(r24135)
+++ branches/0.6/libavcodec/ac3_parser.c	Fri Jul  9 03:16:42 2010	(r24136)
@@ -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);