[FFmpeg-cvslog] Merge commit '0c00fd80ee4791bd70b634084307fc9f179e0412'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  9 18:37:16 2012 +0200| [e1a983e6010930ab742bede275de1ccf921485b7] | committer: Michael Niedermayer

Merge commit '0c00fd80ee4791bd70b634084307fc9f179e0412'

Just for metadata, this change has been integrated by hand already

* commit '0c00fd80ee4791bd70b634084307fc9f179e0412':
  avconv: split the code for processing input packets out of transcode()

Conflicts:
	ffmpeg.c

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

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