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)
commitcc61ef0479f07ddb9f22cbf3fa9ca28d6fd0cf72
treec65062a711988b3c44794d888daf92773cf8b59e
parentd894e64acca98b091d503a8f61410c02c8e98b20
parent42cc6cefd315c1556e2a52f7ebe2f766ec82b790
Merge commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790'

* commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790':
  avconv: report the error for codec open failure

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