summaryrefslogtreecommitdiffstats
path: root/libswscale/input.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-04 21:33:07 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-04 21:33:29 +0200
commit0b25261d29c6b348e2dccc2985090cf10a60c34f (patch)
tree3798257fc3502fffffd3913451f739fee1d33656 /libswscale/input.c
parent073c074447c253111790c0472fb83f184e66814e (diff)
parente0d73fda361729d207e51fa2afd8ba6102e58d98 (diff)
downloadffmpeg-streaming-0b25261d29c6b348e2dccc2985090cf10a60c34f.zip
ffmpeg-streaming-0b25261d29c6b348e2dccc2985090cf10a60c34f.tar.gz
Merge commit 'e0d73fda361729d207e51fa2afd8ba6102e58d98'
* commit 'e0d73fda361729d207e51fa2afd8ba6102e58d98': avutil: add alias names for gray 8/16 colour spaces Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/input.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud