Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Aug 2014 01:58:11 +0000 (03:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Aug 2014 01:58:14 +0000 (03:58 +0200)
commit1aa153d644792d2a9b3a6776b1b0ef906fb7feb1
tree619239b8dfaaef4a2d456afef053fa22d8e24960
parent50a4d5cfc6749932347ee38c25b5040aea4b13a0
parent7c0c97cc05afeaa52dfad902ae6639557fb71261
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  fate: Fix ffprobe tests with --target-path set.
  doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate.
  Do not print a useless error number if mov header reading fails.

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