Merge commit '555000c7d5c1e13043a948ebc48d2939b0ba6536'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 12:32:59 +0000 (13:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 12:34:06 +0000 (13:34 +0100)
commit8bcebf9e4a480de4a904b5843e9ecb74cf44bfdf
treebaf634156394d6b143873b6c423a1c5819e17b1f
parent87d263a122f6212c236531f8586598605ecab87c
parent555000c7d5c1e13043a948ebc48d2939b0ba6536
Merge commit '555000c7d5c1e13043a948ebc48d2939b0ba6536'

* commit '555000c7d5c1e13043a948ebc48d2939b0ba6536':
  h264: check that DPB is allocated before accessing it in flush_dpb()
  vf_hqdn3d: fix uninitialized variable use
  vf_gradfun: fix uninitialized variable use

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavfilter/vf_gradfun.c
libavfilter/vf_hqdn3d.c