[FFmpeg-cvslog] Merge commit '19dd4017ab6dac11c77d797acebee4f60ad63a6f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 16:31:21 2013 +0100| [bf780b7ea8d9420e39f59d565d283806c31de193] | committer: Michael Niedermayer

Merge commit '19dd4017ab6dac11c77d797acebee4f60ad63a6f'

* commit '19dd4017ab6dac11c77d797acebee4f60ad63a6f':
  libopencore-amr: Add the missing 3rd argument of ff_get_buffer()
  vmdaudio: fix invalid reads when packet size is not a multiple of chunk size
  wmaprodec: return an error, not 0, when the input is too small.

Conflicts:
	libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf780b7ea8d9420e39f59d565d283806c31de193
---