Merge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Feb 2013 12:13:42 +0000 (13:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Feb 2013 12:13:42 +0000 (13:13 +0100)
commitbb29ee62e9ef30c26988f386e7c3be7affe836f9
treeb09b40010a8fd2096190cfcf34c7682fc55b63d8
parent1c5b8b916d3d068aef9b8d0842d9258eb6cb978d
parentd2a25c4032ce6ceabb0f51b5c1e6ca865395a793
Merge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793'

* commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793':
  get_buffer(): do not initialize the data.

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
cmdutils.c
libavcodec/utils.c