diff options
| author | jstebbins <[email protected]> | 2011-03-11 22:40:30 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2011-03-11 22:40:30 +0000 |
| commit | d68cb8a25201663f832307990b2a98cc60d8ab14 (patch) | |
| tree | 936279196cd07e6d68b19b6a79de61ec1e6acfbe /macosx/HBPreviewController.m | |
| parent | 4aaed20c697c1a7e8fe7e039cf1949a320758286 (diff) | |
Add parameter parsing and b-frame support to ffmpeg mpeg-4 encoder
The cli will now accept ':' separated parameters using the '-x' option
for ffmpeg mpeg-4. The linux gui has an entry box on the advanced tab
to add options. The option keys and values are the same as what the
ffmpeg command line allows.
Calculation of DTS timestamps was added to encavcodec.c in order to allow
out of order b-frames. The algorithm is similar to what x264 uses.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3839 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/HBPreviewController.m')
| -rw-r--r-- | macosx/HBPreviewController.m | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/macosx/HBPreviewController.m b/macosx/HBPreviewController.m index a4d8b8455..a674c58b5 100644 --- a/macosx/HBPreviewController.m +++ b/macosx/HBPreviewController.m @@ -893,15 +893,15 @@ * which will determine which subtitles to enable, if any. */ job->pass = -1; - x264opts_tmp = job->x264opts; + x264opts_tmp = job->advanced_opts; - job->x264opts = NULL; + job->advanced_opts = NULL; job->indepth_scan = 1; /* * Add the pre-scan job */ hb_add( fPreviewLibhb, job ); - job->x264opts = x264opts_tmp; + job->advanced_opts = x264opts_tmp; } /* Go ahead and perform the actual encoding preview scan */ job->indepth_scan = 0; |