aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/oggdec.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-17 00:14:50 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-17 00:26:01 +0100
commit196f7da7c81814de7883c8b33c7d3866f7cac687 (patch)
tree796cee395a8728198910f817dc604812c4c6cdcf /libavformat/oggdec.h
parenta67387913eb0c19f2dac4f1e085e5429d2074d6f (diff)
parent0d882e9e7b78f3874ef9511d739da9d64f1ec58a (diff)
downloadffmpeg-196f7da7c81814de7883c8b33c7d3866f7cac687.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: avutil: Remove deprecated intfloat_readwrite code Conflicts: libavutil/intfloat_readwrite.c libavutil/intfloat_readwrite.h The files are left in place as they are still used by some projects mplayer is one. Theres no hurry in removing the code, it can as well be removed once no projects use it anymore Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oggdec.h')
0 files changed, 0 insertions, 0 deletions