Commit a99f0ad1 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '91767360'

* commit '91767360':
  a64multienc: Do not entangle coded_frame

Conflicts:
	libavcodec/a64multienc.c
Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents 6497aab0 91767360
...@@ -66,7 +66,8 @@ static const int mc_colors[5]={0x0,0xb,0xc,0xf,0x1}; ...@@ -66,7 +66,8 @@ static const int mc_colors[5]={0x0,0xb,0xc,0xf,0x1};
//static const int mc_colors[5]={0x0,0x8,0xa,0xf,0x7}; //static const int mc_colors[5]={0x0,0x8,0xa,0xf,0x7};
//static const int mc_colors[5]={0x0,0x9,0x8,0xa,0x3}; //static const int mc_colors[5]={0x0,0x9,0x8,0xa,0x3};
static void to_meta_with_crop(AVCodecContext *avctx, const AVFrame *p, int *dest) static void to_meta_with_crop(AVCodecContext *avctx,
const AVFrame *p, int *dest)
{ {
int blockx, blocky, x, y; int blockx, blocky, x, y;
int luma = 0; int luma = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment