Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '3496cec43304ac040d6d05f9d500a6f93cc049e7'

Browse Source 
* commit '3496cec43304ac040d6d05f9d500a6f93cc049e7':
  msrle: Use AVFrame instead of AVPicture

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
pull/155/head
Hendrik Leppkes 9 years ago
parent e9a2ab3ac7 3496cec433
commit d3cc258a61
6 changed files with 9 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libavcodec/aasc.c
  2. 2
      libavcodec/bmp.c
  3. 2
      libavcodec/msrle.c
  4. 6
      libavcodec/msrledec.c
  5. 2
      libavcodec/msrledec.h
  6. 2
      libavcodec/tscc.c

4
libavcodec/aasc.c
Unescape View File

@ -101,7 +101,7 @@ static int aasc_decode_frame(AVCodecContext *avctx,
switch (avctx->codec_tag) { switch (avctx->codec_tag) {
case MKTAG('A', 'A', 'S', '4'): case MKTAG('A', 'A', 'S', '4'):
bytestream2_init(&s->gb, buf - 4, buf_size + 4); bytestream2_init(&s->gb, buf - 4, buf_size + 4);
ff_msrle_decode(avctx, (AVPicture*)s->frame, 8, &s->gb); ff_msrle_decode(avctx, s->frame, 8, &s->gb);
break; break;
case MKTAG('A', 'A', 'S', 'C'): case MKTAG('A', 'A', 'S', 'C'):
switch (compr) { switch (compr) {
@ -117,7 +117,7 @@ static int aasc_decode_frame(AVCodecContext *avctx,
break; break;
case 1: case 1:
bytestream2_init(&s->gb, buf, buf_size); bytestream2_init(&s->gb, buf, buf_size);
ff_msrle_decode(avctx, (AVPicture*)s->frame, 8, &s->gb); ff_msrle_decode(avctx, s->frame, 8, &s->gb);
break; break;
default: default:
av_log(avctx, AV_LOG_ERROR, "Unknown compression type %d\n", compr); av_log(avctx, AV_LOG_ERROR, "Unknown compression type %d\n", compr);

2
libavcodec/bmp.c
Unescape View File

@ -276,7 +276,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
p->linesize[0] = -p->linesize[0]; p->linesize[0] = -p->linesize[0];
} }
bytestream2_init(&gb, buf, dsize); bytestream2_init(&gb, buf, dsize);
ff_msrle_decode(avctx, (AVPicture*)p, depth, &gb); ff_msrle_decode(avctx, p, depth, &gb);
if (height < 0) { if (height < 0) {
p->data[0] += p->linesize[0] * (avctx->height - 1); p->data[0] += p->linesize[0] * (avctx->height - 1);
p->linesize[0] = -p->linesize[0]; p->linesize[0] = -p->linesize[0];

2
libavcodec/msrle.c
Unescape View File

@ -135,7 +135,7 @@ static int msrle_decode_frame(AVCodecContext *avctx,
} }
} else { } else {
bytestream2_init(&s->gb, buf, buf_size); bytestream2_init(&s->gb, buf, buf_size);
ff_msrle_decode(avctx, (AVPicture*)s->frame, avctx->bits_per_coded_sample, &s->gb); ff_msrle_decode(avctx, s->frame, avctx->bits_per_coded_sample, &s->gb);
} }
if ((ret = av_frame_ref(data, s->frame)) < 0) if ((ret = av_frame_ref(data, s->frame)) < 0)

6
libavcodec/msrledec.c
Unescape View File

@ -30,7 +30,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "msrledec.h" #include "msrledec.h"
static int msrle_decode_pal4(AVCodecContext *avctx, AVPicture *pic, static int msrle_decode_pal4(AVCodecContext *avctx, AVFrame *pic,
GetByteContext *gb) GetByteContext *gb)
{ {
unsigned char rle_code; unsigned char rle_code;
@ -126,7 +126,7 @@ static int msrle_decode_pal4(AVCodecContext *avctx, AVPicture *pic,
} }
static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic, static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVFrame *pic,
int depth, GetByteContext *gb) int depth, GetByteContext *gb)
{ {
uint8_t *output, *output_end; uint8_t *output, *output_end;
@ -246,7 +246,7 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic,
} }
int ff_msrle_decode(AVCodecContext *avctx, AVPicture *pic, int ff_msrle_decode(AVCodecContext *avctx, AVFrame *pic,
int depth, GetByteContext *gb) int depth, GetByteContext *gb)
{ {
switch(depth){ switch(depth){

2
libavcodec/msrledec.h
Unescape View File

@ -33,7 +33,7 @@
* @param depth bit depth * @param depth bit depth
* @param gb input bytestream context * @param gb input bytestream context
*/ */
int ff_msrle_decode(AVCodecContext *avctx, AVPicture *pic, int ff_msrle_decode(AVCodecContext *avctx, AVFrame *pic,
int depth, GetByteContext *gb); int depth, GetByteContext *gb);
#endif /* AVCODEC_MSRLEDEC_H */ #endif /* AVCODEC_MSRLEDEC_H */

2
libavcodec/tscc.c
Unescape View File

@ -94,7 +94,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
if (ret != Z_DATA_ERROR) { if (ret != Z_DATA_ERROR) {
bytestream2_init(&c->gb, c->decomp_buf, bytestream2_init(&c->gb, c->decomp_buf,
c->decomp_size - c->zstream.avail_out); c->decomp_size - c->zstream.avail_out);
ff_msrle_decode(avctx, (AVPicture*)frame, c->bpp, &c->gb); ff_msrle_decode(avctx, frame, c->bpp, &c->gb);
} }
/* make the palette available on the way out */ /* make the palette available on the way out */

Write Preview
Loading…
Cancel
Save