diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2010-07-09 01:16:42 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2010-07-09 01:16:42 +0000 |
| commit | 61eb1655141747886fe2fc43036e0402015777f3 (patch) | |
| tree | 963b1849f743da557bdec878c8e5e70c89a1312c | |
| parent | 9d1213912f57080b3d314b5d7ab0950d84cf930c (diff) | |
| download | ffmpeg-61eb1655141747886fe2fc43036e0402015777f3.tar.gz | |
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
Originally committed as revision 24136 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
| -rw-r--r-- | libavcodec/ac3_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c index 856f97aafb..6cd666b4fb 100644 --- a/libavcodec/ac3_parser.c +++ b/libavcodec/ac3_parser.c @@ -181,7 +181,7 @@ static int ac3_sync(uint64_t state, AACAC3ParseContext *hdr_info, 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); |