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)
* qatar/master:
  avio: Use AVERROR_PROTOCOL_NOT_FOUND

Conflicts:
libavformat/avio.c

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

Trivial merge