diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 14:34:17 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 14:34:17 +0400 |
| commit | de7b08cbc1c11482405504e76f402e5c32b60f22 (patch) | |
| tree | b1bccd3d5c36320dec021f1a1fe9b8abae4399a8 /libavformat/a64.c | |
| parent | 87988d6569ce603fc5a29a806a241dde5651242f (diff) | |
| parent | e070d0a5ca9047192e324a3f87006b316e2a08a7 (diff) | |
Merge commit 'e070d0a5ca9047192e324a3f87006b316e2a08a7'
* commit 'e070d0a5ca9047192e324a3f87006b316e2a08a7':
frame: Remove some FF_API_AVFRAME_COLORSPACE leftovers
Conflicts:
libavutil/frame.c
No change, as these leftovers have already been removed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/a64.c')
0 files changed, 0 insertions, 0 deletions