[FFmpeg-cvslog] Merge commit 'f154ef1ae5b03f288dd8c025dab1884b4cb20c1a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  9 15:14:57 2012 +0200| [b7e9eea31f3e60dc506cf52bb78f0d9f679cb3bd] | committer: Michael Niedermayer

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 at gmx.at>

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