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)
* commit '51eb213d00154b8e7856c7667ea62db8b0f663d4':
  libavformat: use avpriv_open()

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

Simple merge