diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 00:23:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 00:23:30 +0200 |
| commit | 097bf149c92aeae8af7f3559878e046a047e892d (patch) | |
| tree | 7bb61ba820651ab35f769abf0a2be6b95e372890 /libavutil | |
| parent | ad1b571b268223155ebeffbed05c61813a3138b9 (diff) | |
| parent | aa51b0492bfced6d650fb5ff419e2b13fde6833d (diff) | |
Merge commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d'
* commit 'aa51b0492bfced6d650fb5ff419e2b13fde6833d':
avconv: rename output_packet() to process_input_packet()
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
0 files changed, 0 insertions, 0 deletions