Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Dec 2012 14:52:16 +0000 (15:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Dec 2012 14:58:07 +0000 (15:58 +0100)
commit2f980cf39a14f90b9356b51ef1ed6e7816f6aac3
treefaf8d16ad3dc12e37a8f2854bdab16192709f42b
parent874c5b02c4117d5261365d0de727c0b4dc9363f6
parentff953fecffd3b9a616a046723fb9d4690be032a6
Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6'

* commit 'ff953fecffd3b9a616a046723fb9d4690be032a6':
  lavc: set frame properties in ff_get_buffer().

Conflicts:
libavcodec/utils.c

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