Merge commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Jun 2013 10:45:15 +0000 (12:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Jun 2013 10:56:05 +0000 (12:56 +0200)
commitd894e64acca98b091d503a8f61410c02c8e98b20
tree875a6c78f785b7c864d8e84eabf4c592be0b1f57
parent730e07f10b972aaf63e3aeb04d6f179c5640fd6f
parent1e340af8d6a97cc013a2ad8ba77c77129625a34f
Merge commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f'

* commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f':
  avconv: drop additional strerror fallback

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