diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 12:54:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 12:54:01 +0200 |
| commit | 57bc64e235fde80c8e543a6e7f9b4439c36633bb (patch) | |
| tree | 79d2c03314e88ab6f7a107d1723ccbf8ad738b95 /doc/ffmpeg.txt | |
| parent | 26f6acc66b668aa9cb97d487aa980a361d4030a1 (diff) | |
| parent | 1a3598aae768465a8efc8475b6df5a8261bc62fc (diff) | |
| download | ffmpeg-57bc64e235fde80c8e543a6e7f9b4439c36633bb.tar.gz | |
Merge commit '1a3598aae768465a8efc8475b6df5a8261bc62fc'
* commit '1a3598aae768465a8efc8475b6df5a8261bc62fc':
jpeg2000: Use bytestream2
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffmpeg.txt')
0 files changed, 0 insertions, 0 deletions