mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-10-04 04:00:46 +00:00
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avio: Use AVERROR_PROTOCOL_NOT_FOUND
Conflicts:
libavformat/avio.c
See: 12eeced8b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
2f9422d951