* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
*/
/**
#include <string.h>
#include <unistd.h>
-#include "common.h"
#include "avcodec.h"
#include "bswap.h"
static int flic_decode_init(AVCodecContext *avctx)
{
- FlicDecodeContext *s = (FlicDecodeContext *)avctx->priv_data;
+ FlicDecodeContext *s = avctx->priv_data;
unsigned char *fli_header = (unsigned char *)avctx->extradata;
int depth;
s->avctx = avctx;
- avctx->has_b_frames = 0;
s->fli_type = AV_RL16(&fli_header[4]); /* Might be overridden if a Magic Carpet FLC */
depth = AV_RL16(&fli_header[12]);
void *data, int *data_size,
uint8_t *buf, int buf_size)
{
- FlicDecodeContext *s = (FlicDecodeContext *)avctx->priv_data;
+ FlicDecodeContext *s = avctx->priv_data;
int stream_ptr = 0;
int stream_ptr_after_color_chunk;
{
/* Note, the only difference between the 15Bpp and 16Bpp */
/* Format is the pixel format, the packets are processed the same. */
- FlicDecodeContext *s = (FlicDecodeContext *)avctx->priv_data;
+ FlicDecodeContext *s = avctx->priv_data;
int stream_ptr = 0;
int pixel_ptr;
}
/* Now FLX is strange, in that it is "byte" as opposed to "pixel" run length compressed.
- * This doesnt give us any good oportunity to perform word endian conversion
- * during decompression. So if its requried (ie, this isnt a LE target, we do
+ * This does not give us any good oportunity to perform word endian conversion
+ * during decompression. So if it is required (i.e., this is not a LE target, we do
* a second pass over the line here, swapping the bytes.
*/
- pixel = 0xFF00;
- if (0xFF00 != AV_RL16(&pixel)) /* Check if its not an LE Target */
- {
- pixel_ptr = y_ptr;
- pixel_countdown = s->avctx->width;
- while (pixel_countdown > 0) {
+#ifdef WORDS_BIGENDIAN
+ pixel_ptr = y_ptr;
+ pixel_countdown = s->avctx->width;
+ while (pixel_countdown > 0) {
*((signed short*)(&pixels[pixel_ptr])) = AV_RL16(&buf[pixel_ptr]);
pixel_ptr += 2;
- }
}
+#endif
y_ptr += s->frame.linesize[0];
}
break;
buf, buf_size);
}
- /* Shouldnt get here, ever as the pix_fmt is processed */
+ /* Should not get here, ever as the pix_fmt is processed */
/* in flic_decode_init and the above if should deal with */
/* the finite set of possibilites allowable by here. */
- /* but in case we do, just error out. */
- av_log(avctx, AV_LOG_ERROR, "Unknown Format of FLC. My Science cant explain how this happened\n");
+ /* But in case we do, just error out. */
+ av_log(avctx, AV_LOG_ERROR, "Unknown FLC format, my science cannot explain how this happened.\n");
return -1;
}