Merge commit '0c00fd80ee4791bd70b634084307fc9f179e0412'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Aug 2012 16:37:16 +0000 (18:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Aug 2012 16:43:12 +0000 (18:43 +0200)
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@gmx.at>

Trivial merge