aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/bfin/bswap.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-04 01:44:06 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-04 01:44:06 +0100
commit259a960f1b74339626f8da890cc261a4043097fe (patch)
treeaea69b2dcfe4dfabedf82725fecbd2a551412f55 /libavutil/bfin/bswap.h
parentbb99ae3ae924c942a634bec7711ec7ee11c38eb9 (diff)
parent2a6eb06254df79e96b3d791b6b89b2534ced3119 (diff)
downloadffmpeg-259a960f1b74339626f8da890cc261a4043097fe.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: vp6: Fix illegal read. avfilter: Don't copy garbage from the stack when setting up video pictures. avcodec: Make sure codec_type is set by avcodec_get_context_defaults2 avcodec: Remove a misplaced and useless attribute_deprecated avconv: add -dump_attachment option. avconv: add -attach option. avconv: make negative mappings disable only streams from the specified file fmtconvert: fix int32_to_float_fmul_scalar() for windows x86_64 Conflicts: libavcodec/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/bfin/bswap.h')
0 files changed, 0 insertions, 0 deletions