Merge commit '78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 12:28:33 +0000 (13:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 12:28:33 +0000 (13:28 +0100)
commit5ef0c00580e25afa32d5a6ef86559ffb9ce3b2dc
tree4cd6345e7313d8284bc647bb283b7cc502e6675b
parent66f436adf5a30b19d2730a884417f2a0fd5e0925
parent78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5
Merge commit '78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5'

* commit '78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5':
  ansi: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/ansi.c

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