Changeset a897ba33 in ffmpeg

Timestamp:

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

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7630e564

Parents:

64a0ed19 (diff), 0f21d8b (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 '0f21d8b1b40848973558c737aebe800c46e93a3d'

• commit '0f21d8b1b40848973558c737aebe800c46e93a3d': pictordec: stop using deprecated avcodec_set_dimensions pgssubdec: stop using deprecated avcodec_set_dimensions pcx: stop using deprecated avcodec_set_dimensions mpegvideo_parser: stop using deprecated avcodec_set_dimensions

Conflicts:

libavcodec/pcx.c
libavcodec/pgssubdec.c
libavcodec/pictordec.c

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

(No files)