Changeset bf92cd81 in ffmpeg

Timestamp:

Nov 1, 2013, 2:07:25 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

64a0ed19

Parents:

e6b9d71a (diff), 967cd6f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '967cd6fafbf2fdec9cbe011296ad34a70212427e'

• commit '967cd6fafbf2fdec9cbe011296ad34a70212427e': libopenjpegdec: stop using deprecated avcodec_set_dimensions kgv1dec: stop using deprecated avcodec_set_dimensions ivi_common: stop using deprecated avcodec_set_dimensions indeo3: stop using deprecated avcodec_set_dimensions

Conflicts:

libavcodec/ivi_common.c
libavcodec/kgv1dec.c
libavcodec/libopenjpegdec.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)