diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2010-07-07 23:52:24 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2010-07-07 23:52:24 +0000 |
| commit | a26f1d109264efe3a6b47395495319359a8fe878 (patch) | |
| tree | 87713730a2527e2555d0c4e30ba34fdb73271bda /libavcodec | |
| parent | c84d5aa74fcb99bf570f2891c381638744b5b289 (diff) | |
| download | ffmpeg-a26f1d109264efe3a6b47395495319359a8fe878.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.
Originally committed as revision 24103 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -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); |