Merge commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Jun 2013 10:56:48 +0000 (12:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Jun 2013 10:56:55 +0000 (12:56 +0200)
* commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790':
  avconv: report the error for codec open failure

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

diff --cc ffmpeg.c
Simple merge