Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
pull/28/head
Michael Niedermayer 12 years ago
parent fc97f8e0e2 0c00fd80ee
commit e1a983e601
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available