summaryrefslogtreecommitdiffstats
path: root/libavcodec/g2meet.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-17 22:38:51 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-17 22:38:51 +0200
commita8d01a73789260533778371e38e733d047316d83 (patch)
tree8feb3e26813848ac20bbad3c6c99a6c9e4b5f37a /libavcodec/g2meet.c
parent39edcadc07e90c551596e74a932b603eea0c8b01 (diff)
parent0983d48111f578e17e8c1967d25ce593fce62b63 (diff)
downloadffmpeg-streaming-a8d01a73789260533778371e38e733d047316d83.zip
ffmpeg-streaming-a8d01a73789260533778371e38e733d047316d83.tar.gz
Merge commit '0983d48111f578e17e8c1967d25ce593fce62b63'
* commit '0983d48111f578e17e8c1967d25ce593fce62b63': crc: add ANSI CRC16 LE Conflicts: doc/APIchanges libavutil/crc.c libavutil/crc.h libavutil/version.h tests/ref/fate/crc Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g2meet.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud