Skip to content
Snippets Groups Projects
Commit 097bf149 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'aa51b049' 


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

Conflicts:
	ffmpeg.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents ad1b571b aa51b049
Branches
Tags
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 4 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment