aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/aac_ac3_parser.c
diff options
context:
space:
mode:
authorJoakim Plate <elupus@ecce.se>2009-02-19 00:28:19 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2009-02-19 00:28:19 +0000
commit4cff8dc88fb9932ad797e03e6df9aef91272b46e (patch)
treed5e05430d4218e7669ab007ac4ec27786d9f87cd /libavcodec/aac_ac3_parser.c
parent3899eb2f65ddcda27e352edb760e181cb11cbc76 (diff)
downloadffmpeg-4cff8dc88fb9932ad797e03e6df9aef91272b46e.tar.gz
Allow AC-3 parser to modify codec_id.
Patch by Joakim Plate (elupus A ecce D se). Originally committed as revision 17447 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/aac_ac3_parser.c')
-rw-r--r--libavcodec/aac_ac3_parser.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
index fedabdf815..ab3269f2db 100644
--- a/libavcodec/aac_ac3_parser.c
+++ b/libavcodec/aac_ac3_parser.c
@@ -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 &&