[FFmpeg-cvslog] Merge commit 'e9cc98839574c7e8d546e890ebbf57d1766e5d8a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 28 12:20:41 2013 +0100| [e63ebaca16b7620441dda9e21b8773ef7e7ae2df] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e63ebaca16b7620441dda9e21b8773ef7e7ae2df
---