Merge commit 'f7e85ee996b3886c2b13e928b83277382311af96'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Jan 2014 14:07:45 +0000 (15:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Jan 2014 14:07:45 +0000 (15:07 +0100)
commitea4b477a1b3c2c7cda8cb62a986691cdb7b1cac4
tree7d40556d954169ef21968fb56d6e4673d2a8fbfb
parent9ab8f3738a4cf386538a76e97490237d7a5a249b
parentf7e85ee996b3886c2b13e928b83277382311af96
Merge commit 'f7e85ee996b3886c2b13e928b83277382311af96'

* commit 'f7e85ee996b3886c2b13e928b83277382311af96':
  lavc: allow the caller to override dimensions in ff_get_buffer()

Conflicts:
libavcodec/utils.c

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