diff options
| author | Kostya <kostya.shishkov@gmail.com> | 2011-06-17 07:28:58 +0000 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-07-06 14:52:02 +0200 |
| commit | df64da3b1ef0c7014135bce44e5f82becf81fe79 (patch) | |
| tree | e9ecb6e91da26d99497ab733cc0df9a41e5ad0ee | |
| parent | 0fedf754b24331ae80a50816cd02ad0eba9beba4 (diff) | |
| download | ffmpeg-df64da3b1ef0c7014135bce44e5f82becf81fe79.tar.gz | |
bink: pass Bink version to audio decoder through extradata instead of codec_tag.
This is needed because not all players (e.g. MPlayer) are able to distinguish
two different Bink audio decoders when codec_tag is set.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/binkaudio.c | 2 | ||||
| -rw-r--r-- | libavformat/bink.c | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index a05b0b56b2..9722bdff3e 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -90,7 +90,7 @@ static av_cold int decode_init(AVCodecContext *avctx) return -1; } - s->version_b = avctx->codec_tag == MKTAG('B','I','K','b'); + s->version_b = avctx->extradata && avctx->extradata[3] == 'b'; if (avctx->codec->id == CODEC_ID_BINKAUDIO_RDFT) { // audio is already interleaved for the RDFT format variant diff --git a/libavformat/bink.c b/libavformat/bink.c index 76b457c21b..067673819a 100644 --- a/libavformat/bink.c +++ b/libavformat/bink.c @@ -134,13 +134,18 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap) if (!ast) return AVERROR(ENOMEM); ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; - ast->codec->codec_tag = vst->codec->codec_tag; + ast->codec->codec_tag = 0; ast->codec->sample_rate = avio_rl16(pb); av_set_pts_info(ast, 64, 1, ast->codec->sample_rate); flags = avio_rl16(pb); ast->codec->codec_id = flags & BINK_AUD_USEDCT ? CODEC_ID_BINKAUDIO_DCT : CODEC_ID_BINKAUDIO_RDFT; ast->codec->channels = flags & BINK_AUD_STEREO ? 2 : 1; + ast->codec->extradata = av_mallocz(4 + FF_INPUT_BUFFER_PADDING_SIZE); + if (!ast->codec->extradata) + return AVERROR(ENOMEM); + ast->codec->extradata_size = 4; + AV_WL32(ast->codec->extradata, vst->codec->codec_tag); } for (i = 0; i < bink->num_audio_tracks; i++) |