flac in l-smash

diff --git a/audio/encoders.c b/audio/encoders.c
index cf95c9d..44e5152 100644
--- a/audio/encoders.c
+++ b/audio/encoders.c
@@ -26,6 +26,7 @@ const audio_encoder_entry_t registered_audio_encoders[] = {
     { "ac3",        "ac3",              &audio_encoder_lavc, },
     { "eac3",       "eac3",             &audio_encoder_lavc, },
     { "alac",       "alac",             &audio_encoder_lavc, },
+    { "flac",       "flac",             &audio_encoder_lavc, },
     { "aac",        "libvo_aacenc",     &audio_encoder_lavc, },
     { "amrwb",      "libvo_amrwbenc",   &audio_encoder_lavc, },
     { "mp2",        "mp2",              &audio_encoder_lavc, },
diff --git a/audio/encoders/enc_lavc.c b/audio/encoders/enc_lavc.c
index e3f0416..e6049f3 100644
--- a/audio/encoders/enc_lavc.c
+++ b/audio/encoders/enc_lavc.c
@@ -51,6 +51,7 @@ static const struct {
     { CODEC_ID_AC3,     "ac3",     MODE_BITRATE,          96 },
     { CODEC_ID_EAC3,    "eac3",    MODE_BITRATE,          96 },
     { CODEC_ID_ALAC,    "alac",    MODE_IGNORED,          64 },
+    { CODEC_ID_FLAC,    "flac",    MODE_IGNORED,          8 },
     { CODEC_ID_AMR_NB,  "amrnb",   MODE_BITRATE,          12.2 },
     { CODEC_ID_AMR_WB,  "amrwb",   MODE_BITRATE,          12.65 },
     { CODEC_ID_PCM_F32BE, "pcm_f32be", MODE_IGNORED,      0 },
diff --git a/output/matroska.c b/output/matroska.c
index d0cce72..fbd5646 100644
--- a/output/matroska.c
+++ b/output/matroska.c
@@ -67,7 +67,7 @@ static int audio_init( hnd_t handle, hnd_t filters, char *audio_enc, char *audio
     {
         char audio_params[MAX_ARGS];
         const char *used_enc;
-        const audio_encoder_t *encoder = x264_select_audio_encoder( audio_enc, (char*[]){ "aac", "ac3", "eac3", "vorbis", "mp3", "raw", NULL }, &used_enc );
+        const audio_encoder_t *encoder = x264_select_audio_encoder( audio_enc, (char*[]){ "aac", "ac3", "flac", "eac3", "vorbis", "mp3", "raw", NULL }, &used_enc );
         FAIL_IF_ERR( !encoder, "mkv", "unable to select audio encoder\n" );

         snprintf( audio_params, MAX_ARGS, "%s,codec=%s", audio_parameters, used_enc );
@@ -202,6 +202,8 @@ static int set_audio_track( mkv_hnd_t *p_mkv, x264_param_t *p_param )
         atrack->codec_id = MK_AUDIO_TAG_AC3;
     else if( !strcmp( info->codec_name, "eac3" ) )
         atrack->codec_id = MK_AUDIO_TAG_EAC3;
+    else if( !strcmp( info->codec_name, "flac" ) )
+        atrack->codec_id = MK_AUDIO_TAG_FLAC;
     else if( !strcmp( info->codec_name, "dca" ) )
         atrack->codec_id = MK_AUDIO_TAG_DTS;
     else if( !strcmp( info->codec_name, "vorbis" ) )