diff options
| author | wm4 <wm4@nowhere> | 2018-04-22 19:40:36 +0200 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2018-04-29 02:21:32 +0300 |
| commit | 6c8362ef54f4e90476553cb6b64996cc414da06d (patch) | |
| tree | ab3fa75a18958bacc08c473304f59519a58f5969 /etc | |
| parent | 8135e25600ace2894df274e6a825cfef525fee77 (diff) | |
| download | mpv-6c8362ef54f4e90476553cb6b64996cc414da06d.tar.bz2 mpv-6c8362ef54f4e90476553cb6b64996cc414da06d.tar.xz | |
encode: rewrite half of it
The main change is that we wait with opening the muxer ("writing
headers") until we have data from all streams. This fixes race
conditions at init due to broken assumptions in the old code.
This also changes a lot of other stuff. I found and fixed a few API
violations (often things for which better mechanisms were invented, and
the old ones are not valid anymore). I try to get away from the public
mutex and shared fields in encode_lavc_context. For now it's still
needed for some timestamp-related fields, but most are gone. It also
removes some bad code duplication between audio and video paths.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/encoding-profiles.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/encoding-profiles.conf b/etc/encoding-profiles.conf index c6f716a8bb..5f09faa6c8 100644 --- a/etc/encoding-profiles.conf +++ b/etc/encoding-profiles.conf @@ -108,7 +108,7 @@ of = 3gp ocopyts = yes profile = enc-v-h263 profile = enc-a-aac -ofopts-clr = yes +ofopts = "" [enc-f-avi] profile-desc = "MPEG-4 + MP3 (for AVI)" @@ -117,7 +117,7 @@ ocopyts = no oautofps = yes profile = enc-v-mpeg4 profile = enc-a-mp3 -ofopts-clr = yes +ofopts = "" [enc-f-mp4] profile-desc = "H.264 + AAC (for MP4)" @@ -135,7 +135,7 @@ of = webm ocopyts = yes profile = enc-v-vp9 profile = enc-a-opus -ofopts-clr = yes +ofopts = "" ################## # target devices # |