Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dolby/ott #485

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Dolby/ott #485

wants to merge 17 commits into from

Commits on Mar 18, 2020

  1. Update the build files to support Dolby Codecs

    @ShaoWeiguo
    ShaoWeiguo committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    78d0695 View commit details
    Browse the repository at this point in the history

  2. Update source codes to support Dolby Codecs

    @ShaoWeiguo
    ShaoWeiguo committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    e86469a View commit details
    Browse the repository at this point in the history

  3. Update python script to support Dolby Codecs

    @ShaoWeiguo
    ShaoWeiguo committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    0624a0a View commit details
    Browse the repository at this point in the history

  4. update Lib.mak to fix space issue

    @ShaoWeiguo
    ShaoWeiguo committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    7e727b3 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2020

  1. Merge from master and resolve conflicts

    @ShaoWeiguo
    ShaoWeiguo committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    fbdc93a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into dolby/ott 

    # Conflicts:
#	Build/Targets/x86-microsoft-win32-vs2010/Bento4/Bento4.vcxproj
#	Build/Targets/x86-microsoft-win32-vs2010/Bento4/Bento4.vcxproj.filters
    @ShaoWeiguo
    ShaoWeiguo committed Mar 19, 2020
    Configuration menu
    Copy the full SHA
    84ebc9f View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2020

  1. Merge the changes from Perforce main branch

    @ShaoWeiguo
    ShaoWeiguo committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    3888260 View commit details
    Browse the repository at this point in the history

  2. code clean and white space issue fixed for frontend

    @ShaoWeiguo
    ShaoWeiguo committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    db81321 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2020

  1. Code clean and white space issue fixed for Codec and Core modules

    @ShaoWeiguo
    ShaoWeiguo committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    5652dd3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into dolby/ott 

    # Conflicts:
#	Source/Python/utils/mp4-dash.py
#	Source/Python/utils/mp4-hls.py
#	Source/Python/utils/mp4utils.py
    @ShaoWeiguo
    ShaoWeiguo committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    3bc2344 View commit details
    Browse the repository at this point in the history

  3. Some update after merging master branch

    @ShaoWeiguo
    ShaoWeiguo committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    a34fa3d View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2020

  1. resolve issues due to python3

    @ShaoWeiguo
    ShaoWeiguo committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    5eaad11 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2020

  1. Merge branch 'master' (17e26f7) into dolby/ott 

    # Conflicts:
#	Source/C++/Apps/Mp42Hls/Mp42Hls.cpp
#	Source/C++/Apps/Mp4Fragment/Mp4Fragment.cpp
#	Source/C++/Apps/Mp4Mux/Mp4Mux.cpp
#	Source/Python/utils/mp4-dash.py
#	Source/Python/utils/mp4-hls.py
    @ShaoWeiguo
    ShaoWeiguo committed May 18, 2020
    Configuration menu
    Copy the full SHA
    e4219e7 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2020

  1. Update due to merging latest commit

    @ShaoWeiguo
    ShaoWeiguo committed May 20, 2020
    Configuration menu
    Copy the full SHA
    b225378 View commit details
    Browse the repository at this point in the history

  2. Fix Dolby Vision version, Dolby Vision encryption and AC-4 in HLS sig… 

    …naling issues.
    @ShaoWeiguo
    ShaoWeiguo committed May 20, 2020
    Configuration menu
    Copy the full SHA
    8d2b6e7 View commit details
    Browse the repository at this point in the history

  3. Code clean and fix lgtm warning

    @ShaoWeiguo
    ShaoWeiguo committed May 20, 2020
    Configuration menu
    Copy the full SHA
    ff590f0 View commit details
    Browse the repository at this point in the history

  4. tiny bug fix

    @ShaoWeiguo
    ShaoWeiguo committed May 20, 2020
    Configuration menu
    Copy the full SHA
    ba8dd53 View commit details
    Browse the repository at this point in the history