@@ -72,6 +72,9 @@ get_next:

     /* update codec info */

     avctx->sample_rate = s->sample_rate;

+    if(s->codec_id)

+        avctx->codec_id = s->codec_id;

+

     /* allow downmixing to stereo (or mono for AC-3) */

     if(avctx->request_channels > 0 &&

             avctx->request_channels < s->channels &&

@@ -53,6 +53,7 @@ typedef struct AACAC3ParseContext {

     uint64_t state;

     int need_next_header;

+    enum CodecID codec_id;

 } AACAC3ParseContext;

 int ff_aac_ac3_parse(AVCodecParserContext *s1,

@@ -175,6 +175,10 @@ static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info,

     hdr_info->bit_rate = hdr.bit_rate;

     hdr_info->channels = hdr.channels;

     hdr_info->samples = AC3_FRAME_SIZE;

+    if(hdr.bitstream_id>10)

+        hdr_info->codec_id = CODEC_ID_EAC3;

+    else

+        hdr_info->codec_id = CODEC_ID_AC3;

     *need_next_header = (hdr.frame_type != EAC3_FRAME_TYPE_AC3_CONVERT);

     *new_frame_start  = (hdr.frame_type != EAC3_FRAME_TYPE_DEPENDENT);