Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: galsapir/ffmpeg-python
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: kkroening/ffmpeg-python
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 17 commits
  • 16 files changed
  • 8 contributors

Commits on Oct 7, 2020

  1. Configuration menu
    Copy the full SHA
    96fb3ff View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b64f40a View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2020

  1. Configuration menu
    Copy the full SHA
    17995f5 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2021

  1. Merge pull request kkroening#430 from Jacotsu/master

    Implemented cwd parameter
    depau authored Feb 15, 2021
    Configuration menu
    Copy the full SHA
    4974364 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2021

  1. Configuration menu
    Copy the full SHA
    c764166 View commit details
    Browse the repository at this point in the history
  2. Merge pull request kkroening#493 from kkroening/revert-430-master

    Revert "Implemented cwd parameter"
    depau authored Feb 16, 2021
    Configuration menu
    Copy the full SHA
    cc1f664 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    807aacc View commit details
    Browse the repository at this point in the history
  4. Merge pull request kkroening#494 from kkroening/revert-493-revert-430…

    …-master
    
    Revert "Revert "Implemented cwd parameter""
    depau authored Feb 16, 2021
    Configuration menu
    Copy the full SHA
    f307972 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2022

  1. Configuration menu
    Copy the full SHA
    fd1da13 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2022

  1. Use GitHub Actions for CI. (kkroening#641)

    This sets up GitHub Actions (GHA) to run in place of the
    currently broken Travis CI.  Initially, this only covers running
    tox/pytest and Black, but may eventually be extended to run pylint,
    mypy, flake8, etc. - see kkroening#605, for example.
    
    Notes:
    * Python 3.10 is not yet supported due to the `collections.Iterable`
      issue discussed in kkroening#330, kkroening#624, etc.
    * The Black CI step acts as a linting step, rather than attempting to
      have the GHA job automatically update/commit/push the reformarted
      code.
    * Black is currently pinned to an older version that supports
      `--target-version py27` until Python 2 compatibility can be dropped in
      the final Python 2 compatibility release of ffmpeg-python.
    * Only the main source directory (`ffmpeg/`) is checked with Black at
      the moment.  The `examples/` directory should also be checked, but
      will be done as a separate PR.
    
    Co-authored by: Christian Clauss <[email protected]>
    kkroening authored Mar 7, 2022
    Configuration menu
    Copy the full SHA
    29b6f09 View commit details
    Browse the repository at this point in the history
  2. Add FFmpeg installation instructions (kkroening#642)

    Co-authored-by: digitalcircuits <[email protected]>
    Co-authored-by: digitalcircuits <digitalcircuits@github>
    3 people authored Mar 7, 2022
    Configuration menu
    Copy the full SHA
    cb9d400 View commit details
    Browse the repository at this point in the history
  3. Import ABC from collections.abc for Python 3.9+ compatibility (kkroen…

    …ing#330)
    
    * Import ABC from collections.abc instead of collections for Python 3.9 compatibility.
    
    * Fix deprecation warnings due to invalid escape sequences.
    
    * Support Python 3.10
    
    Co-authored-by: Karl Kroening <[email protected]>
    tirkarthi and kkroening authored Mar 7, 2022
    Configuration menu
    Copy the full SHA
    6189cd6 View commit details
    Browse the repository at this point in the history
  4. Fix heigth -> height typo (kkroening#596)

    Co-authored-by: Karl Kroening <[email protected]>
    ljhcage and kkroening authored Mar 7, 2022
    Configuration menu
    Copy the full SHA
    fc41f4a View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2022

  1. Configuration menu
    Copy the full SHA
    ed70f2e View commit details
    Browse the repository at this point in the history
  2. Fix Black in GHA for Python 2.7 (kkroening#680)

    (At least until Python 2.7 support is finally eliminated)
    kkroening authored Jul 11, 2022
    Configuration menu
    Copy the full SHA
    ef00863 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    35886c9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    df129c7 View commit details
    Browse the repository at this point in the history
Loading