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)
* commit '1e340af8d6a97cc013a2ad8ba77c77129625a34f':
  avconv: drop additional strerror fallback

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

diff --cc ffmpeg.c
Simple merge