aboutsummaryrefslogtreecommitdiffstats
path: root/presets
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-09 01:22:31 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-03-09 01:22:31 +0100
commita8cedbebf163ad376abc4703b3156c44d0858404 (patch)
tree7198ad7a96b58d3ea53b2208601b707da2db3c00 /presets
parenta4524930d9299dbb8fafe165105d83bf7b6d3b89 (diff)
parentea1d64ab1066145ba919b79a2080f3091d562217 (diff)
downloadffmpeg-a8cedbebf163ad376abc4703b3156c44d0858404.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: ttadec: unbreak playback of matroska files vorbisdec: avoid invalid memory access Fix uninitialized reads on malformed ogg files. huffyuv: add padding to classic (v1) huffman tables. png: convert to bytestream2 API. dca: include libavutil/mathematics.h for possibly missing M_SQRT1_2 avs: fix infinite loop on end-of-stream. tiffdec: Prevent illegal memory access caused by recycled pointers. rtpenc: Fix the AVRational used for av_rescale_q_rnd wma: fix off-by-one in array bounds check. Conflicts: libavcodec/huffyuv.c libavcodec/pngdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets')
0 files changed, 0 insertions, 0 deletions