diff options
112 files changed, 2294 insertions, 1265 deletions
diff --git a/.travis.yml b/.travis.yml index b7881a1ad7..8e3d962834 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,44 +1,39 @@ -language: c +language: generic os: - linux - #- osx + +services: + - docker + +sudo: required + env: matrix: - - LIBAV=ffmpeg-git - - LIBAV=libav-git + - CONTAINER=registry.cirno.systems/kiwi/containers/mpv-ci:stable-deps CI_SCRIPT=ci/build-tumbleweed.sh CC=gcc + - CONTAINER=registry.cirno.systems/kiwi/containers/mpv-ci:stable-deps CI_SCRIPT=ci/build-tumbleweed.sh CC=clang + - CONTAINER=registry.cirno.systems/kiwi/containers/mpv-ci:snapshot-deps CI_SCRIPT=ci/build-tumbleweed.sh CC=gcc + - CONTAINER=registry.cirno.systems/kiwi/containers/mpv-ci:snapshot-deps CI_SCRIPT=ci/build-tumbleweed.sh CC=clang + - CONTAINER=registry.cirno.systems/kiwi/containers/mpv-ci-mingw64:i686 CI_SCRIPT=ci/build-mingw64.sh TARGET=i686-w64-mingw32 + - CONTAINER=registry.cirno.systems/kiwi/containers/mpv-ci-mingw64:x86_64 CI_SCRIPT=ci/build-mingw64.sh TARGET=x86_64-w64-mingw32 global: # Coverity token - secure: "H21mSRlMhk4BKS0xHZvCFGJxteCP0hRVUxTuNfM2Z9HBsyutuLEYMtViLO86VtM+Tqla3xXPzUdS4ozLwI72Ax/5ZUDXACROj73yW6QhFB5D6rLut12+FjqC7M33Qv2hl0xwgNBmR5dsm1ToP37+Wn+ecJQNvN8fkTXF+HVzOEw=" # Travis token for mpv.io - secure: "nlTVLJK6kRhtXvhKCoJ3YdFGHuKaq/eHowfPw25hqRWuBOZd+HjHY5KIYjV7SxuKFDpJE4GpNcvA3Q31nsqomxpkLYgrwjg6TSazN7ZP+x85ZgV1QGFebrPfGm2n5UR5CAPAwFoeF3pZheLi4bajVzwq1fWW+x3grS188P9OZso=" -compiler: - - clang - - gcc branches: only: - master - ci - coverity_scan + - /release\/.*$/ -matrix: - exclude: - - os: osx - env: LIBAV=libav-git - - os: osx - env: LIBAV=ffmpeg-git - - os: osx - compiler: gcc - - os: linux - compiler: clang - - env: LIBAV=libav-git - -before_install: TOOLS/travis-deps libass-stable $LIBAV +before_install: + - docker pull $CONTAINER script: - ./bootstrap.py - - ./waf configure - - ./waf build + - docker run --env CC --env TARGET -v $TRAVIS_BUILD_DIR:/build $CONTAINER /bin/sh -c "cd /build && $CI_SCRIPT" after_failure: cat ./build/config.log after_script: TOOLS/travis-rebuild-website diff --git a/DOCS/client-api-changes.rst b/DOCS/client-api-changes.rst index 73e3048498..b9b264d220 100644 --- a/DOCS/client-api-changes.rst +++ b/DOCS/client-api-changes.rst @@ -31,12 +31,15 @@ API changes =========== :: - - --- mpv 0.29.0 --- - 1.102 - redo handling of async commands + --- mpv 0.30.0 --- + 1.103 - redo handling of async commands - add mpv_event_command and make it possible to return values from commands issued with mpv_command_async() or mpv_command_node_async() - add mpv_abort_async_command() + 1.102 - rename struct mpv_opengl_drm_osd_size to mpv_opengl_drm_draw_surface_size + - rename MPV_RENDER_PARAM_DRM_OSD_SIZE to MPV_RENDER_PARAM_DRM_DRAW_SURFACE_SIZE + + --- mpv 0.29.0 --- 1.101 - add MPV_RENDER_PARAM_ADVANCED_CONTROL and related API - add MPV_RENDER_PARAM_NEXT_FRAME_INFO and related symbols - add MPV_RENDER_PARAM_BLOCK_FOR_TARGET_TIME diff --git a/DOCS/edl-mpv.rst b/DOCS/edl-mpv.rst index 7c9f64e160..2d451926cb 100644 --- a/DOCS/edl-mpv.rst +++ b/DOCS/edl-mpv.rst @@ -147,6 +147,24 @@ Example:: Plays chapter 3 and ends with the start of chapter 7 (4 chapters later). +Implicit chapters +================= + +mpv will add one chapter per segment entry to the virtual timeline. + +By default, the chapter's titles will match the entries' filenames. +You can override set the ``title`` option to override the chapter title for +that segment. + +Example:: |