Changeset 4a356512 in ffmpeg
- Timestamp:
-
Nov 1, 2013, 1:01:02 PM
(11 years ago)
- Author:
- Michael Niedermayer <michaelni@gmx.at>
- Branches:
- master
- Children:
- bf688d23
- Parents:
- f016a23c (diff), d6da3729 (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 'd6da372984c87fd6288c148c291065d6032ceda3'
- commit 'd6da372984c87fd6288c148c291065d6032ceda3':
eacmv: stop using deprecated avcodec_set_dimensions
dvdsubdec: stop using deprecated avcodec_set_dimensions
dvdec: stop using deprecated avcodec_set_dimensions
dpx: stop using deprecated avcodec_set_dimensions
Conflicts:
libavcodec/dpx.c
libavcodec/dvdec.c
libavcodec/dvdsubdec.c
libavcodec/eacmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-
(No files)
-
