Merge commit '0c00fd80ee4791bd70b634084307fc9f179e0412'

Browse Source

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>

...

This commit is contained in:

Michael Niedermayer 2012-08-09 18:37:16 +02:00

parent fc97f8e0e2 0c00fd80ee

commit e1a983e601

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available