aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/wmv2.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-07 03:38:50 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-07 03:38:50 +0200
commit86602d1c79929caa1b88b942f0074b1481b52235 (patch)
treeb25d18d943dd732ef7814ad9d5392d62e07ffdfd /libavcodec/wmv2.c
parent177ed7e818d1e3cb8159b99965254f1236bff106 (diff)
parenta72cad0a6c05aa74940101e937cb3dc602d7d67b (diff)
downloadffmpeg-86602d1c79929caa1b88b942f0074b1481b52235.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: vp6: Reset the internal state when aborting key frames header parsing vp56: Release old pictures after a resolution changes vp6: Check for huffman tree build errors vp56: Check for missing reference frame data cinepak: Fix invalid read access on extra data vmd: fix segfaults on corruped streams cook: Fix js_vlc_bits value validation for joint stereo segafilm: Check for memory allocation failures in segafilm demuxer. segafilm: Fix potential division by 0 on corrupted streams in the demuxer Fixed segfault on corrupted sega streams in the demuxer. Fixed deference of NULL pointer in motionpixels decoder. libx264: support 9- and 10-bit output. h264: correct implicit_weight for field-interlaced pictures. mpegvideo: set correct offset for edge emulation buffer. mpegvideo: fix position of bottom edge. Conflicts: libavcodec/motionpixels.c libavcodec/mpegvideo.c libavcodec/version.h libavcodec/vmdav.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmv2.c')
0 files changed, 0 insertions, 0 deletions