Merge master.

[dcpomatic.git] / branch-notes

diff --git a/branch-notes b/branch-notes
index 1348831350cb3bdacf6408818c88d906054f451f..f713f5d2aebb646b29be7bcf73e3c5e4d9e87635 100644 (file)
--- a/branch-notes
+++ b/branch-notes
@@ -1,8 +1,7 @@
-ffmpeg content selected stream is really a playlist thing.
-
 things to put back
        frame rate description  
        trust content header?
        overall length?
        trim method (trim in general)
        A/B
+