Merge commit '2ce8bca51f7264b47027f69d50dd8e49aa2fd683'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Jan 2014 15:11:53 +0000 (16:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Jan 2014 15:11:53 +0000 (16:11 +0100)
commit206c06d96f68be737202c0fb554c13fb8b261133
treec1e652397d09f00682e93e9f9d7f37e106bae5a6
parent58770db2ae67d9b4b6adcf2b15951f9608442051
parent2ce8bca51f7264b47027f69d50dd8e49aa2fd683
Merge commit '2ce8bca51f7264b47027f69d50dd8e49aa2fd683'

* commit '2ce8bca51f7264b47027f69d50dd8e49aa2fd683':
  avconv: print a warning when falling back to default 25fps

Conflicts:
ffmpeg.c

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