[FFmpeg-cvslog] Merge commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May  3 13:53:08 2013 +0200| [22dc25cb29ab7b84d6d03f56766a15b6556a7b11] | committer: Michael Niedermayer

Merge commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe'

* commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe':
  avconv: improve -re implementation

Conflicts:
	ffmpeg.c

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

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