diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-01-14 01:15:42 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2012-01-14 01:15:42 +0100 |
| commit | dd55adb1a704983482e3839a3a509d416d84d36a (patch) | |
| tree | c9009591d71edfdb69cc3ef2c0b9242224647cd0 /libavcodec/dpx.c | |
| parent | 0b1f20e23c3d61d06c86ee1aa160cd4da8b47b0c (diff) | |
| download | android_external_ffmpeg-dd55adb1a704983482e3839a3a509d416d84d36a.tar.gz android_external_ffmpeg-dd55adb1a704983482e3839a3a509d416d84d36a.tar.bz2 android_external_ffmpeg-dd55adb1a704983482e3839a3a509d416d84d36a.zip | |
Support reading 64bit dpx images.
Reviewed-by: Jean First
Diffstat (limited to 'libavcodec/dpx.c')
| -rw-r--r-- | libavcodec/dpx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/dpx.c b/libavcodec/dpx.c index e8dae300e5..8a30ca6dff 100644 --- a/libavcodec/dpx.c +++ b/libavcodec/dpx.c @@ -140,11 +140,11 @@ static int decode_frame(AVCodecContext *avctx, case 12: case 16: if (endian) { - avctx->pix_fmt = PIX_FMT_RGB48BE; + avctx->pix_fmt = elements == 4 ? PIX_FMT_RGBA64BE : PIX_FMT_RGB48BE; } else { - avctx->pix_fmt = PIX_FMT_RGB48LE; + avctx->pix_fmt = elements == 4 ? PIX_FMT_RGBA64LE : PIX_FMT_RGB48LE; } - target_packet_size = 6; + target_packet_size = source_packet_size = elements * 2; break; default: |