diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 20:26:41 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 20:26:48 +0100 |
commit | 59398c1342693dea70a1ce671dabf19861c4d849 (patch) | |
tree | 31314e9a2a9ca8b2f6cd78896c65994539579732 /libavutil/hash.h | |
parent | 618bdb7f580003012568573b3ce0551a789d2f60 (diff) | |
parent | fa3bfeb1c152c03cd98430992dd670d59007b051 (diff) | |
download | ffmpeg-59398c1342693dea70a1ce671dabf19861c4d849.tar.gz |
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd/fbdev_enc: add default device
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/hash.h')
0 files changed, 0 insertions, 0 deletions