Merge commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 22:23:30 +0000 (00:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 22:23:30 +0000 (00:23 +0200)
commit097bf149c92aeae8af7f3559878e046a047e892d
tree7bb61ba820651ab35f769abf0a2be6b95e372890
parentad1b571b268223155ebeffbed05c61813a3138b9
parentaa51b0492bfced6d650fb5ff419e2b13fde6833d
Merge commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d'

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

Conflicts:
ffmpeg.c

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