diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 13:28:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 13:28:33 +0100 |
| commit | 5ef0c00580e25afa32d5a6ef86559ffb9ce3b2dc (patch) | |
| tree | 4cd6345e7313d8284bc647bb283b7cc502e6675b /libavcodec/cdxl.c | |
| parent | 66f436adf5a30b19d2730a884417f2a0fd5e0925 (diff) | |
| parent | 78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5 (diff) | |
Merge commit '78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5'
* commit '78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5':
ansi: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/ansi.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cdxl.c')
0 files changed, 0 insertions, 0 deletions