Merge commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Aug 2012 13:14:57 +0000 (15:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Aug 2012 13:23:00 +0000 (15:23 +0200)
commitb7e9eea31f3e60dc506cf52bb78f0d9f679cb3bd
tree1f16a190ad58a5a7209c610759efeb72d7646ca3
parente13df05fdbb3507d40b8c0e82a05ff67e90b8f3e
parentf154ef1ae5b03f288dd8c025dab1884b4cb20c1a
Merge commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a'

* commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a':
  avconv: send EOF to lavfi even if flushing the decoder fails
  avconv: get rid of pointless temporary variable.
  avconv: simplify transcode().
  avconv: cosmetics
  avconv: replace no_packet array in transcode() with a var in InputStream
  avconv: remove unused variable from InputFile.
  avconv: remove commented out cruft.
  avconv: maintain sync on lavfi outputs.

Conflicts:
ffmpeg.c
ffmpeg.h

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