diff options
| author | Rodeo <[email protected]> | 2011-09-19 21:15:01 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2011-09-19 21:15:01 +0000 |
| commit | a3367322b982a61975df2a28307455d16a7ab081 (patch) | |
| tree | 6cd2359254fc23066d3a08e9edfc43e93898937c /gtk/src/presets.c | |
| parent | 3453ca5ca1601c613e2998fc18ce49f5a13fe0b5 (diff) | |
libhb: Auto Passthru and audio/video encoder lists.
This adds Auto Passthru as another encoder in libhb.
Used in LinGUI and CLI. MacGUI features a partial impplmentation (with hardcoded values), which is disabled for now.
Also, audio and video encoders are now stored in "lists", like we previously did for mixdowns.
New mixdown "None" (HB_AMIXDOWN_NONE) added to hb_audio_mixdowns (was previously declared in MacGUI/LinGUI).
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4237 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk/src/presets.c')
| -rw-r--r-- | gtk/src/presets.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gtk/src/presets.c b/gtk/src/presets.c index bc87e9a14..8305c4ae3 100644 --- a/gtk/src/presets.c +++ b/gtk/src/presets.c @@ -1989,8 +1989,9 @@ typedef struct static value_map_t vcodec_xlat[] = { {"MPEG-2 (FFmpeg)", "ffmpeg2"}, + {"MPEG-4 (FFmpeg)", "ffmpeg4"}, {"MPEG-4 (FFmpeg)", "ffmpeg"}, - {"MPEG-4 (XviD)", "ffmpeg"}, + {"MPEG-4 (XviD)", "ffmpeg4"}, {"H.264 (x264)", "x264"}, {"VP3 (Theora)", "theora"}, {NULL,NULL} @@ -2002,13 +2003,20 @@ static value_map_t acodec_xlat[] = {"AAC (faac)", "faac"}, {"AAC (CoreAudio)", "faac"}, {"HE-AAC (CoreAudio)", "faac"}, + {"AC3 (ffmpeg)", "ffac3"}, {"AC3 (ffmpeg)", "ac3"}, {"AC3", "ac3"}, // Backwards compatibility with mac ui + {"MP3 Passthru", "copy:mp3"}, {"MP3 Passthru", "mp3pass"}, + {"AAC Passthru", "copy:aac"}, {"AAC Passthru", "aacpass"}, + {"AC3 Passthru", "copy:ac3"}, {"AC3 Passthru", "ac3pass"}, + {"DTS Passthru", "copy:dts"}, {"DTS Passthru", "dtspass"}, + {"DTS-HD Passthru", "copy:dtshd"}, {"DTS-HD Passthru", "dtshdpass"}, + {"Auto Passthru", "copy"}, {"Auto Passthru", "auto"}, {"MP3 (lame)", "lame"}, {"Vorbis (vorbis)", "vorbis"}, |