aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/svq3.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-01 13:07:15 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-01 13:07:15 +0100
commit7b91e9cf5dc7b46216aa4da79943aecf9425ab04 (patch)
tree24e303e1b752801434c49e4516fc3d02a55c500f /libavcodec/svq3.c
parentf62dfed3de400fa02f770ea8a0b750fc297336bf (diff)
parent7644f5a80787c9b608b82873604805d7e38a6a18 (diff)
downloadffmpeg-7b91e9cf5dc7b46216aa4da79943aecf9425ab04.tar.gz
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>
Diffstat (limited to 'libavcodec/svq3.c')
0 files changed, 0 insertions, 0 deletions