Changeset 7630e564 in ffmpeg

Timestamp:

Nov 1, 2013, 2:34:49 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ffd100b1

Parents:

a897ba33 (diff), c755870d (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 'c755870d52c8c29676e5ba7ee9557adf4a7ca934'

• commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934': sgidec: stop using deprecated avcodec_set_dimensions rv34: stop using deprecated avcodec_set_dimensions rv10: stop using deprecated avcodec_set_dimensions ptx: stop using deprecated avcodec_set_dimensions

Conflicts:

libavcodec/ptx.c
libavcodec/rv10.c
libavcodec/sgidec.c

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

(No files)