diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 13:42:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 13:43:05 +0200 |
| commit | 06549cee42819c2bef58bd123cd0ac9d916244f2 (patch) | |
| tree | 6f21733cbef7f46ad243c5f375db2ceb02a9089c /ffmpeg_opt.c | |
| parent | c1fc4ff937cd923dd8221ce8dcbf3d7fd6cecb76 (diff) | |
| parent | 7798a59dc14ae27efe64e639a42646002608a908 (diff) | |
| download | ffmpeg-06549cee42819c2bef58bd123cd0ac9d916244f2.tar.gz | |
Merge commit '7798a59dc14ae27efe64e639a42646002608a908'
* commit '7798a59dc14ae27efe64e639a42646002608a908':
avconv: Don't include colorspace.h
No change as the commit is already part of ffmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions