diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 14:49:10 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 14:49:10 +0200 |
| commit | b95534bb674acfe7689ca03cb4fa215c28f8f44f (patch) | |
| tree | d111b6ccd31e8f1ce79a8f475b511861882ac1f6 /libavformat/g722.c | |
| parent | 46ff31d39c2e3dcb5237ecfac45316c0d13a57ed (diff) | |
| parent | e47b8bbf0b54599d44b9330eb4d68cdde4f6d298 (diff) | |
| download | ffmpeg-b95534bb674acfe7689ca03cb4fa215c28f8f44f.tar.gz | |
Merge commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298'
* commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298':
avcodec: Bump micro version after changing public JPEG 2000 defines
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/g722.c')
0 files changed, 0 insertions, 0 deletions