diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-22 15:41:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-22 15:58:57 +0100 |
| commit | f98821dddb4abb3764fc2f22a6afe3eb11292d3c (patch) | |
| tree | 90a82a51e8ec1d98854d8466c37d5877ed5db46b /libavcodec/jpeg2000.h | |
| parent | 3c096751ffe85861cd88ee822b86f10155b7b639 (diff) | |
| parent | d922c5a5fbaf0b6c73bd8c81ae059bc6e406961c (diff) | |
| download | ffmpeg-f98821dddb4abb3764fc2f22a6afe3eb11292d3c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: Fix a typo from the previous commit
See: 76dd01ecd4ed51e0669773470ee0d8db2c2e4d3f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000.h')
0 files changed, 0 insertions, 0 deletions