Mercurial > mplayer.hg
comparison mencoder.c @ 33706:489f118781b7
100l, forgot to test without -vobsub.
| author | reimar |
|---|---|
| date | Sat, 02 Jul 2011 08:17:45 +0000 |
| parents | 09bdaa0c82b3 |
| children | d5d3d2c6b6e3 |
comparison
equal
deleted
inserted
replaced
| 33705:db1b1a1ecba8 | 33706:489f118781b7 |
|---|---|
| 775 if (new_srate > 192000) new_srate = 192000; | 775 if (new_srate > 192000) new_srate = 192000; |
| 776 playback_speed = (float)new_srate / (float)sh_audio->samplerate; | 776 playback_speed = (float)new_srate / (float)sh_audio->samplerate; |
| 777 } | 777 } |
| 778 } | 778 } |
| 779 | 779 |
| 780 vo_vobsub = vobsub_open(vobsub_name, spudec_ifo, 1, &vo_spudec); | 780 if (vobsub_name) |
| 781 vo_vobsub = vobsub_open(vobsub_name, spudec_ifo, 1, &vo_spudec); | |
| 781 | 782 |
| 782 // set up video encoder: | 783 // set up video encoder: |
| 783 | 784 |
| 784 if (!curfile) { // curfile is non zero when a second file is opened | 785 if (!curfile) { // curfile is non zero when a second file is opened |
| 785 if (vobsub_out) { | 786 if (vobsub_out) { |