Merge commit '44129e38047b6a27291e487c2084894958c6f399'

Browse Source

* commit '44129e38047b6a27291e487c2084894958c6f399':
  avconv: Do not pass NULL to avio_tell

This commit is a noop. The FFmpeg code handle cases where total_size is
an AVERROR (which avio_tell(NULL) will return) later in the function.

Note: the original commit refers to the null *muxer*. `ffmpeg -lavfi
testsrc -f null -` can be used as a test case.

Merged-by: Clément Bœsch <u@pkh.me>

pull/259/head

Clément Bœsch 8 years ago

parent 1e8daf31e0 44129e3804

commit 313264ba24

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available