Merge commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 11:53:08 +0000 (13:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 11:53:08 +0000 (13:53 +0200)
commit22dc25cb29ab7b84d6d03f56766a15b6556a7b11
tree2baa43c1842984e04e46dd28dcc09b19bf0c7455
parent6537827189153cd1c6944403a48d7ff76f7b8228
parentb4a5a292274f904f404f40f826c51e6fc9cfb8fe
Merge commit 'b4a5a292274f904f404f40f826c51e6fc9cfb8fe'

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

Conflicts:
ffmpeg.c

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