Skip to content

F
ffmpeg
Commit 6d09d6ed authored by Paul B Mahol's avatar Paul B Mahol
Browse files
Options

avcodec/magicyuv: add 10 bit support 

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent bec8ea20
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 2 deletions
configure
View file @ 6d09d6ed
...@@ -2441,7 +2441,7 @@ jv_decoder_select="blockdsp" ...@@ -2441,7 +2441,7 @@ jv_decoder_select="blockdsp"
lagarith_decoder_select="huffyuvdsp" lagarith_decoder_select="huffyuvdsp"
ljpeg_encoder_select="aandcttables idctdsp jpegtables" ljpeg_encoder_select="aandcttables idctdsp jpegtables"
loco_decoder_select="golomb" loco_decoder_select="golomb"
magicyuv_decoder_select="huffyuvdsp" magicyuv_decoder_select="huffyuvdsp llviddsp"
mdec_decoder_select="blockdsp idctdsp mpegvideo" mdec_decoder_select="blockdsp idctdsp mpegvideo"
metasound_decoder_select="lsp mdct sinewin" metasound_decoder_select="lsp mdct sinewin"
mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp" mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp"
......
libavcodec/magicyuv.c
View file @ 6d09d6ed
This diff is collapsed.
libavcodec/x86/lossless_videodsp_init.c
View file @ 6d09d6ed
...@@ -42,7 +42,7 @@ void ff_llviddsp_init_x86(LLVidDSPContext *c, AVCodecContext *avctx) ...@@ -42,7 +42,7 @@ void ff_llviddsp_init_x86(LLVidDSPContext *c, AVCodecContext *avctx)
c->diff_int16 = ff_diff_int16_mmx; c->diff_int16 = ff_diff_int16_mmx;
} }
if (EXTERNAL_MMXEXT(cpu_flags) && pix_desc->comp[0].depth<16) { if (EXTERNAL_MMXEXT(cpu_flags) && pix_desc && pix_desc->comp[0].depth<16) {
c->add_hfyu_median_pred_int16 = ff_add_hfyu_median_pred_int16_mmxext; c->add_hfyu_median_pred_int16 = ff_add_hfyu_median_pred_int16_mmxext;
c->sub_hfyu_median_pred_int16 = ff_sub_hfyu_median_pred_int16_mmxext; c->sub_hfyu_median_pred_int16 = ff_sub_hfyu_median_pred_int16_mmxext;
} }
......
libavformat/isom.c
View file @ 6d09d6ed
...@@ -275,6 +275,10 @@ const AVCodecTag ff_codec_movvideo_tags[] = { ...@@ -275,6 +275,10 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
{ AV_CODEC_ID_DXV, MKTAG('D', 'X', 'D', '3') }, { AV_CODEC_ID_DXV, MKTAG('D', 'X', 'D', '3') },
{ AV_CODEC_ID_DXV, MKTAG('D', 'X', 'D', 'I') }, { AV_CODEC_ID_DXV, MKTAG('D', 'X', 'D', 'I') },
{ AV_CODEC_ID_MAGICYUV, MKTAG('M', '0', 'R', '0') },
{ AV_CODEC_ID_MAGICYUV, MKTAG('M', '0', 'R', 'A') },
{ AV_CODEC_ID_MAGICYUV, MKTAG('M', '0', 'R', 'G') },
{ AV_CODEC_ID_MAGICYUV, MKTAG('M', '0', 'Y', '2') },
{ AV_CODEC_ID_MAGICYUV, MKTAG('M', '8', 'R', 'G') }, { AV_CODEC_ID_MAGICYUV, MKTAG('M', '8', 'R', 'G') },
{ AV_CODEC_ID_MAGICYUV, MKTAG('M', '8', 'R', 'A') }, { AV_CODEC_ID_MAGICYUV, MKTAG('M', '8', 'R', 'A') },
{ AV_CODEC_ID_MAGICYUV, MKTAG('M', '8', 'G', '0') }, { AV_CODEC_ID_MAGICYUV, MKTAG('M', '8', 'G', '0') },
......
libavformat/riff.c
View file @ 6d09d6ed
...@@ -428,6 +428,10 @@ const AVCodecTag ff_codec_bmp_tags[] = { ...@@ -428,6 +428,10 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_M101, MKTAG('M', '1', '0', '1') }, { AV_CODEC_ID_M101, MKTAG('M', '1', '0', '1') },
{ AV_CODEC_ID_M101, MKTAG('M', '1', '0', '2') }, { AV_CODEC_ID_M101, MKTAG('M', '1', '0', '2') },
{ AV_CODEC_ID_MAGICYUV, MKTAG('M', 'A', 'G', 'Y') }, { AV_CODEC_ID_MAGICYUV, MKTAG('M', 'A', 'G', 'Y') },
{ AV_CODEC_ID_MAGICYUV, MKTAG('M', '0', 'R', 'A') },
{ AV_CODEC_ID_MAGICYUV, MKTAG('M', '0', 'R', 'G') },
{ AV_CODEC_ID_MAGICYUV, MKTAG('M', '0', 'G', '0') },
{ AV_CODEC_ID_MAGICYUV, MKTAG('M', '0', 'Y', '2') },
{ AV_CODEC_ID_YLC, MKTAG('Y', 'L', 'C', '0') }, { AV_CODEC_ID_YLC, MKTAG('Y', 'L', 'C', '0') },
{ AV_CODEC_ID_NONE, 0 } { AV_CODEC_ID_NONE, 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