diff options
author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-10-11 23:31:45 +0300 |
---|---|---|
committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-10-12 01:21:13 +0300 |
commit | ec0275843d8eb933699807da81f6f366291f034a (patch) | |
tree | f4adafb9533207c195c2a228a371541c7ca73f09 /libavcodec/utils.c | |
parent | 148418a2bce3a7862f2d00ed4a424620c0d51e18 (diff) |
avcodec: remove leftover iff_byterun1 decoder
It was merged with the iff_ilbm decoder in commit
929a24efff9a208a52748605eb412ffb915c1403.
Define AV_CODEC_ID_IFF_BYTERUN1 as AV_CODEC_ID_IFF_ILBM for API
compatibility.
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 7bfd7608c3..175106714d 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -409,7 +409,7 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, break; } - if (s->codec_id == AV_CODEC_ID_IFF_ILBM || s->codec_id == AV_CODEC_ID_IFF_BYTERUN1) { + if (s->codec_id == AV_CODEC_ID_IFF_ILBM) { w_align = FFMAX(w_align, 8); } |