aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/avs.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-03 12:54:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-03 12:54:01 +0200
commit57bc64e235fde80c8e543a6e7f9b4439c36633bb (patch)
tree79d2c03314e88ab6f7a107d1723ccbf8ad738b95 /libavformat/avs.c
parent26f6acc66b668aa9cb97d487aa980a361d4030a1 (diff)
parent1a3598aae768465a8efc8475b6df5a8261bc62fc (diff)
downloadffmpeg-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 'libavformat/avs.c')
0 files changed, 0 insertions, 0 deletions