diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-25 09:54:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-25 09:54:11 +0200 |
| commit | 575399c7e11611b4cbf30a61e0e8e92f12893896 (patch) | |
| tree | 9eda22086dc72804fc573a85b3ead4f19033be88 /libavutil/des.c | |
| parent | aa96439fae67d8cefa2376d60f9a0e29b234ceaa (diff) | |
| parent | fc18cc44ebfae07da153dc782572e7ce2f6fe47d (diff) | |
| download | ffmpeg-575399c7e11611b4cbf30a61e0e8e92f12893896.tar.gz | |
Merge commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d'
* commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d':
fate: add CVFC1_Sony_C to h264 conformance tests
doc/APIchanges: add missing hashes and dates
Conflicts:
doc/APIchanges
tests/fate/h264.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/des.c')
0 files changed, 0 insertions, 0 deletions