Merge commit '51eb213d00154b8e7856c7667ea62db8b0f663d4'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 09:47:07 +0000 (11:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 09:47:12 +0000 (11:47 +0200)
commit756f865e3b66ba7e9b458cc00ccd386a3361978d
treeee3a10decc153f9bdca5485cc897a871c97f897b
parent95fa1fe437c7dfe7b9a01685d3e9e9f3525f0bdc
parent51eb213d00154b8e7856c7667ea62db8b0f663d4
Merge commit '51eb213d00154b8e7856c7667ea62db8b0f663d4'

* commit '51eb213d00154b8e7856c7667ea62db8b0f663d4':
  libavformat: use avpriv_open()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/file.c