Merge commit 'c50241080d7599c90fc8b4e74c5f8d62a4caae52' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Mar 2013 01:54:35 +0000 (02:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Mar 2013 02:05:36 +0000 (03:05 +0100)
commitbd593a98dc41256fd753924c5cb404f86610cf01
tree73407294995fd781c23340831f9b0fa4579a32fa
parent6f787aa79b59bed2d9df627f90b6fec43f98f936
parentc50241080d7599c90fc8b4e74c5f8d62a4caae52
Merge commit 'c50241080d7599c90fc8b4e74c5f8d62a4caae52' into release/1.1

* commit 'c50241080d7599c90fc8b4e74c5f8d62a4caae52':
  vf_hqdn3d: fix uninitialized variable use
  lzo: fix overflow checking in copy_backptr()
  flacdec: simplify bounds checking in flac_probe()
  atrac3: avoid oversized shifting in decode_bytes()
  shorten: use the unsigned type where needed
  shorten: report meaningful errors
  shorten: K&R formatting cosmetics
  shorten: set invalid channels count to 0

Conflicts:
libavcodec/shorten.c
libavformat/flacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/atrac3.c
libavcodec/shorten.c
libavfilter/vf_hqdn3d.c
libavformat/flacdec.c
libavutil/lzo.c