[FFmpeg-cvslog] Merge commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 14 00:23:30 2014 +0200| [097bf149c92aeae8af7f3559878e046a047e892d] | committer: Michael Niedermayer

Merge commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d'

* commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d':
  avconv: rename output_packet() to process_input_packet()

Conflicts:
	ffmpeg.c

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

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