Merge remote-tracking branch 'dilaroga/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 27 May 2013 07:31:51 +0000 (09:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 27 May 2013 07:32:22 +0000 (09:32 +0200)
* dilaroga/master:
  avcodec/vda_h264_dec: fix a memory leak
  avcodec/vda_h264: use av_buffer to manage buffers

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

Trivial merge