mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
Merge commit '44129e38047b6a27291e487c2084894958c6f399'
* 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>
This commit is contained in:
commit
313264ba24