]> git.sesse.net Git - ffmpeg/commit
Merge commit 'e9cc98839574c7e8d546e890ebbf57d1766e5d8a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Mar 2013 11:20:41 +0000 (12:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Mar 2013 11:20:41 +0000 (12:20 +0100)
commite63ebaca16b7620441dda9e21b8773ef7e7ae2df
tree7a7e6aec593144fcb3b27767d2b31d13d4cbf9da
parentdac1d92cb75733e3eb1431eac4867449e06b6c7a
parente9cc98839574c7e8d546e890ebbf57d1766e5d8a
Merge commit 'e9cc98839574c7e8d546e890ebbf57d1766e5d8a'

* commit 'e9cc98839574c7e8d546e890ebbf57d1766e5d8a':
  win32: Allow other programs to open the same files
  configure: Add error_resilience as dependency to the eatqi decoder

Conflicts:
configure
libavformat/os_support.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure