diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 00:20:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 00:20:56 +0100 |
| commit | 0dd4eff588c59d0c1412eb4a907004017e76badd (patch) | |
| tree | d810d42e14ce84545e6ba942464961cb4b507493 /libavutil/sha.h | |
| parent | 3788b8dbe698384d0167c9f79242d9076168f178 (diff) | |
| parent | fb7127b2c836b53ad5168887cd12871312c8708d (diff) | |
| download | ffmpeg-0dd4eff588c59d0c1412eb4a907004017e76badd.tar.gz | |
Merge commit 'fb7127b2c836b53ad5168887cd12871312c8708d'
* commit 'fb7127b2c836b53ad5168887cd12871312c8708d':
build: h264 parser depends on full h264 decoder
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/sha.h')
0 files changed, 0 insertions, 0 deletions