diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-09 18:37:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-09 18:43:12 +0200 |
| commit | e1a983e6010930ab742bede275de1ccf921485b7 (patch) | |
| tree | 5e1a1d65ff634b5ada12231b10910fcba392a8be /libavformat/rtmpdh.h | |
| parent | fc97f8e0e2146d9a23092b148de9124de2424446 (diff) | |
| parent | 0c00fd80ee4791bd70b634084307fc9f179e0412 (diff) | |
| download | ffmpeg-e1a983e6010930ab742bede275de1ccf921485b7.tar.gz | |
Merge commit '0c00fd80ee4791bd70b634084307fc9f179e0412'
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>
Diffstat (limited to 'libavformat/rtmpdh.h')
0 files changed, 0 insertions, 0 deletions