diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 13:21:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 13:21:14 +0100 |
| commit | 66f436adf5a30b19d2730a884417f2a0fd5e0925 (patch) | |
| tree | 5ac586948d2e48e2d7761b2eaf4daba9fab4ddad /libavcodec/cdxl.c | |
| parent | 51c5768cca3b69c6ff5e0e252d0c6c7e1e0feb82 (diff) | |
| parent | 0f6c1d6d64c9f6255ea579dace27d0dd695f0213 (diff) | |
Merge commit '0f6c1d6d64c9f6255ea579dace27d0dd695f0213'
* commit '0f6c1d6d64c9f6255ea579dace27d0dd695f0213':
lavc/utils: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cdxl.c')
0 files changed, 0 insertions, 0 deletions