mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
const
Originally committed as revision 11764 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
73965d1b96
commit
1855abe556
@ -84,7 +84,7 @@ static int huff_cmp(const void *va, const void *vb){
|
|||||||
* decode Fraps v2 packed plane
|
* decode Fraps v2 packed plane
|
||||||
*/
|
*/
|
||||||
static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w,
|
static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w,
|
||||||
int h, uint8_t *src, int size, int Uoff)
|
int h, const uint8_t *src, int size, int Uoff)
|
||||||
{
|
{
|
||||||
int i, j;
|
int i, j;
|
||||||
GetBitContext gb;
|
GetBitContext gb;
|
||||||
@ -128,7 +128,7 @@ static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w,
|
|||||||
*/
|
*/
|
||||||
static int decode_frame(AVCodecContext *avctx,
|
static int decode_frame(AVCodecContext *avctx,
|
||||||
void *data, int *data_size,
|
void *data, int *data_size,
|
||||||
uint8_t *buf, int buf_size)
|
const uint8_t *buf, int buf_size)
|
||||||
{
|
{
|
||||||
FrapsContext * const s = avctx->priv_data;
|
FrapsContext * const s = avctx->priv_data;
|
||||||
AVFrame *frame = data;
|
AVFrame *frame = data;
|
||||||
@ -136,7 +136,7 @@ static int decode_frame(AVCodecContext *avctx,
|
|||||||
uint32_t header;
|
uint32_t header;
|
||||||
unsigned int version,header_size;
|
unsigned int version,header_size;
|
||||||
unsigned int x, y;
|
unsigned int x, y;
|
||||||
uint32_t *buf32;
|
const uint32_t *buf32;
|
||||||
uint32_t *luma1,*luma2,*cb,*cr;
|
uint32_t *luma1,*luma2,*cb,*cr;
|
||||||
uint32_t offs[4];
|
uint32_t offs[4];
|
||||||
int i, is_chroma, planes;
|
int i, is_chroma, planes;
|
||||||
@ -190,7 +190,7 @@ static int decode_frame(AVCodecContext *avctx,
|
|||||||
f->key_frame = f->pict_type == FF_I_TYPE;
|
f->key_frame = f->pict_type == FF_I_TYPE;
|
||||||
|
|
||||||
if (f->pict_type == FF_I_TYPE) {
|
if (f->pict_type == FF_I_TYPE) {
|
||||||
buf32=(uint32_t*)buf;
|
buf32=(const uint32_t*)buf;
|
||||||
for(y=0; y<avctx->height/2; y++){
|
for(y=0; y<avctx->height/2; y++){
|
||||||
luma1=(uint32_t*)&f->data[0][ y*2*f->linesize[0] ];
|
luma1=(uint32_t*)&f->data[0][ y*2*f->linesize[0] ];
|
||||||
luma2=(uint32_t*)&f->data[0][ (y*2+1)*f->linesize[0] ];
|
luma2=(uint32_t*)&f->data[0][ (y*2+1)*f->linesize[0] ];
|
||||||
|
Loading…
Reference in New Issue
Block a user