diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-01-25 15:49:31 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-01-25 15:49:31 +0000 |
| commit | c88173f78a87be39773024bb662b470e7afc399d (patch) | |
| tree | 23aa4d7a225083577982c3b7b8030d91a684e807 /libmpdemux | |
| parent | f3ce1dc10838b11f063caef39d0aade160389389 (diff) | |
| download | mpv-c88173f78a87be39773024bb662b470e7afc399d.tar.bz2 mpv-c88173f78a87be39773024bb662b470e7afc399d.tar.xz | |
fix aac in mov/mp4
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17483 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/muxer_lavf.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c index 04130683f6..2b6bdec728 100644 --- a/libmpdemux/muxer_lavf.c +++ b/libmpdemux/muxer_lavf.c @@ -190,7 +190,9 @@ static void fix_parameters(muxer_stream_t *stream) if(stream->type == MUXER_TYPE_AUDIO) { ctx->codec_id = codec_get_wav_id(stream->wf->wFormatTag); +#if 0 //breaks aac in mov at least ctx->codec_tag = codec_get_wav_tag(ctx->codec_id); +#endif mp_msg(MSGT_MUXER, MSGL_INFO, "AUDIO CODEC ID: %x, TAG: %x\n", ctx->codec_id, (uint32_t) ctx->codec_tag); ctx->sample_rate = stream->wf->nSamplesPerSec; // mp_msg(MSGT_MUXER, MSGL_INFO, "stream->h.dwSampleSize: %d\n", stream->h.dwSampleSize); @@ -217,9 +219,8 @@ static void fix_parameters(muxer_stream_t *stream) else if(stream->type == MUXER_TYPE_VIDEO) { ctx->codec_id = codec_get_bmp_id(stream->bih->biCompression); -#if 0 //breaks mov/mp4 - ctx->codec_tag= stream->bih->biCompression; -#endif + if(ctx->codec_id <= 0) + ctx->codec_tag= stream->bih->biCompression; mp_msg(MSGT_MUXER, MSGL_INFO, "VIDEO CODEC ID: %d\n", ctx->codec_id); ctx->width = stream->bih->biWidth; ctx->height = stream->bih->biHeight; |