Merge commit '0f6c1d6d64c9f6255ea579dace27d0dd695f0213'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 12:21:14 +0000 (13:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 12:21:14 +0000 (13:21 +0100)
commit66f436adf5a30b19d2730a884417f2a0fd5e0925
tree5ac586948d2e48e2d7761b2eaf4daba9fab4ddad
parent51c5768cca3b69c6ff5e0e252d0c6c7e1e0feb82
parent0f6c1d6d64c9f6255ea579dace27d0dd695f0213
Merge commit '0f6c1d6d64c9f6255ea579dace27d0dd695f0213'

* commit '0f6c1d6d64c9f6255ea579dace27d0dd695f0213':
  lavc/utils: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/utils.c

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