*
* See also: http://wiki.multimedia.cx/index.php?title=TXD
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/intreadwrite.h"
-#include "libavcore/imgutils.h"
+#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "s3tc.h"
if (p->data[0])
avctx->release_buffer(avctx, p);
- if (av_check_image_size(w, h, 0, avctx))
+ if (av_image_check_size(w, h, 0, avctx))
return -1;
if (w != avctx->width || h != avctx->height)
avcodec_set_dimensions(avctx, w, h);
return -1;
}
- p->pict_type = FF_I_TYPE;
+ p->pict_type = AV_PICTURE_TYPE_I;
ptr = p->data[0];
stride = p->linesize[0];
} else if (depth == 16) {
switch (d3d_format) {
case 0:
- if (!flags&1) goto unsupported;
+ if (!(flags & 1))
+ goto unsupported;
case FF_S3TC_DXT1:
ff_decode_dxt1(cur, ptr, w, h, stride);
break;
return 0;
}
-AVCodec txd_decoder = {
- "txd",
- AVMEDIA_TYPE_VIDEO,
- CODEC_ID_TXD,
- sizeof(TXDContext),
- txd_init,
- NULL,
- txd_end,
- txd_decode_frame,
- CODEC_CAP_DR1,
- NULL,
+AVCodec ff_txd_decoder = {
+ .name = "txd",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = CODEC_ID_TXD,
+ .priv_data_size = sizeof(TXDContext),
+ .init = txd_init,
+ .close = txd_end,
+ .decode = txd_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Renderware TXD (TeXture Dictionary) image"),
};