summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-12-29 18:56:28 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-12-29 18:56:28 +0000
commit8f7f2ad9e08400bead40c7e06613b0ba5f0b8aa5 (patch)
treeece1420e718d770ff6c81f37d1ee80d857df363e /libmpcodecs
parent43592897f20b0c8c39f14928be4509120c8cf0e9 (diff)
downloadmpv-8f7f2ad9e08400bead40c7e06613b0ba5f0b8aa5.tar.bz2
mpv-8f7f2ad9e08400bead40c7e06613b0ba5f0b8aa5.tar.xz
first step toward amr-nb muxing support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21787 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ae_lavc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c
index ff0172b662..3677aa108b 100644
--- a/libmpcodecs/ae_lavc.c
+++ b/libmpcodecs/ae_lavc.c
@@ -30,6 +30,7 @@ extern int avcodec_inited;
static int compressed_frame_size = 0;
#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
extern unsigned int codec_get_wav_tag(int id);
+extern const int mp_wav_tags[];
#endif
static int bind_lavc(audio_encoder_t *encoder, muxer_stream_t *mux_a)
@@ -173,6 +174,8 @@ int mpae_init_lavc(audio_encoder_t *encoder)
{
#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
lavc_param_atag = codec_get_wav_tag(lavc_acodec->id);
+ if(!lavc_param_atag)
+ lavc_param_atag = codec_get_tag(mp_wav_tags, lavc_acodec->id);
#else
lavc_param_atag = lavc_find_atag(lavc_param_acodec);
#endif