diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 15:44:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 15:44:15 +0100 |
| commit | 0cfbfaaa12e10dbd2d6cdcf9ed618b9bab91ed04 (patch) | |
| tree | 041202962161e4fb791cbd9f8ddb98cf90fc9613 /libswscale/swscale_unscaled.c | |
| parent | a75f01d7e0bf166a0b443eb15621753619bb8d88 (diff) | |
| parent | 7b89cd20d844cbe763ca34e63e99d110043cf241 (diff) | |
| download | ffmpeg-0cfbfaaa12e10dbd2d6cdcf9ed618b9bab91ed04.tar.gz | |
Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'
* commit '7b89cd20d844cbe763ca34e63e99d110043cf241':
eamad: allocate a dummy reference frame when the real one is missing
Replace remaining includes of audioconvert.h with channel_layout.h
Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_unscaled.c')
| -rw-r--r-- | libswscale/swscale_unscaled.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 8da73b26c2..4a22fcad25 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -532,23 +532,23 @@ static int rgbToPlanarRgbWrapper(SwsContext *c, const uint8_t *src[], dst[1] + srcSliceY * dstStride[1] }; switch (c->srcFormat) { - case PIX_FMT_RGB24: + case AV_PIX_FMT_RGB24: packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst201, stride201, srcSliceH, alpha_first, 3, c->srcW); break; - case PIX_FMT_BGR24: + case AV_PIX_FMT_BGR24: packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst102, stride102, srcSliceH, alpha_first, 3, c->srcW); break; - case PIX_FMT_ARGB: + case AV_PIX_FMT_ARGB: alpha_first = 1; - case PIX_FMT_RGBA: + case AV_PIX_FMT_RGBA: packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst201, stride201, srcSliceH, alpha_first, 4, c->srcW); break; - case PIX_FMT_ABGR: + case AV_PIX_FMT_ABGR: alpha_first = 1; - case PIX_FMT_BGRA: + case AV_PIX_FMT_BGRA: packedtogbr24p((const uint8_t *) src[0], srcStride[0], dst102, stride102, srcSliceH, alpha_first, 4, c->srcW); break; |