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: FFmpeg/FFmpeg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: OneOfOne/FFmpeg
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.
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 20, 2014

  1. Support broken v4l2 webcams

    This fixes "The v4l2 frame is %d bytes, but %d bytes are expected" when using a cheap webcam with v4l2.
    
    It will try 3 times before failing instead of failing right away.
    
    Example (src = `Cubeternet GL-UPC822 UVC WebCam`, dst = `v4l2loopback max_width=320 max_height=240`):
    
        ffmpeg -re -s 640x480 -f v4l2 -i /dev/video0 -f v4l2 -s 320x240 -r 15 -pix_fmt yuv420p /dev/video1
        ...........
        [video4linux2,v4l2 @ 0x1ad8060] The v4l2 frame is 1628 bytes, but 614400 bytes are expected
    
    then exits.
    OneOfOne committed Oct 20, 2014
    Configuration menu
    Copy the full SHA
    7c62b39 View commit details
    Browse the repository at this point in the history
Loading