[FFmpeg-cvslog] Merge commit '7d97511e13ef30cd99bae0e36400de055b72918d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct  4 12:04:51 2014 +0200| [dceebe1a60b148028933cc47a6d92b0738919cfe] | committer: Michael Niedermayer

Merge commit '7d97511e13ef30cd99bae0e36400de055b72918d'

* commit '7d97511e13ef30cd99bae0e36400de055b72918d':
  configure: Add -lrt dependency to avutil's pc file.

Conflicts:
	configure

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

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