[FFmpeg-cvslog] Merge commit '2ce8bca51f7264b47027f69d50dd8e49aa2fd683'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 17 16:11:53 2014 +0100| [206c06d96f68be737202c0fb554c13fb8b261133] | committer: Michael Niedermayer

Merge commit '2ce8bca51f7264b47027f69d50dd8e49aa2fd683'

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

Conflicts:
	ffmpeg.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=206c06d96f68be737202c0fb554c13fb8b261133
---