aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/xtea.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-08 13:11:11 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-08 13:11:11 +0200
commit43c157f4a46cb76739f07782d23d1e4ff8da3253 (patch)
treef74dfcbb6a16498524fa2185ac3160cd224b5c04 /libavutil/xtea.h
parentd7a473926504e2acfa6ae3bead0938e1f4e03441 (diff)
parent7b556be6735371d1040c7076547b8198d9fadd34 (diff)
downloadffmpeg-43c157f4a46cb76739f07782d23d1e4ff8da3253.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: af_resample: avoid conversion of identical sample formats for 1 channel avcodec: allow either planar or interleaved sample format when encoding mono adpcmenc: ensure calls to adpcm_ima_compress_sample() are in the right order timefilter: De-doxygenize normal code comments and drop silly ones gxf: Include the right header for the avpriv_frame_rate_tab declaration Conflicts: libavcodec/adpcmenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/xtea.h')
0 files changed, 0 insertions, 0 deletions