Merge remote-tracking branch 'qatar/master'

Browse Source

* qatar/master:
  avio: Use AVERROR_PROTOCOL_NOT_FOUND

Conflicts:
	libavformat/avio.c

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

...

This commit is contained in:

Michael Niedermayer 2013-10-21 20:09:44 +02:00

parent 2444fca523 ea71aafd68

commit 2f9422d951

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

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available