Merge commit '7644f5a80787c9b608b82873604805d7e38a6a18'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 12:07:15 +0000 (13:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 12:07:15 +0000 (13:07 +0100)
commit7b91e9cf5dc7b46216aa4da79943aecf9425ab04
tree24e303e1b752801434c49e4516fc3d02a55c500f
parentf62dfed3de400fa02f770ea8a0b750fc297336bf
parent7644f5a80787c9b608b82873604805d7e38a6a18
Merge commit '7644f5a80787c9b608b82873604805d7e38a6a18'

* commit '7644f5a80787c9b608b82873604805d7e38a6a18':
  lavc: replace avcodec_set_dimensions with ff_set_dimensions

Conflicts:
libavcodec/utils.c

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