aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/common.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-28 10:14:12 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-28 10:14:16 +0200
commit16310e36d9405b8d7d0da1273b03bec3adfec153 (patch)
treec7dde9eefbdf26af21e462868c91ec0e97644017 /libavutil/common.h
parent831e749bc926db2aea5f999529e176d18c832c82 (diff)
parent41f3c60fbb7420f41295c8e0cf80acf9e71f72d0 (diff)
downloadffmpeg-16310e36d9405b8d7d0da1273b03bec3adfec153.tar.gz
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master: Avoid a null pointer dereference in avcodec_decode_video2(). Set block_align when reading QDM2 in mov. Fix muxing QDM2 mono into caf. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/common.h')
0 files changed, 0 insertions, 0 deletions