Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Oct 2013 18:09:44 +0000 (20:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Oct 2013 18:12:33 +0000 (20:12 +0200)
commit2f9422d951dcbcad68303bed12461388a4e4b8a7
treee3109de2d4dab4924cc862b7cfdf7d4bac8fa0f3
parent2444fca523d7a55caa444caad8946b853984b025
parentea71aafd6881d7ce5cffec56feb45488e3ac5221
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avio: Use AVERROR_PROTOCOL_NOT_FOUND

Conflicts:
libavformat/avio.c

See: 12eeced8b41bbe46693f8c9625ed61b51f8438a1
Merged-by: Michael Niedermayer <michaelni@gmx.at>