projects
/
platform
/
upstream
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 6.1
[platform/upstream/ffmpeg.git]
/
libavcodec
/
ylc.c
diff --git
a/libavcodec/ylc.c
b/libavcodec/ylc.c
index
94d0388
..
b03df31
100644
(file)
--- a/
libavcodec/ylc.c
+++ b/
libavcodec/ylc.c
@@
-18,21
+18,17
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#define YLC_VLC_BITS 10
#include <string.h>
#define YLC_VLC_BITS 10
-#include "libavutil/imgutils.h"
-#include "libavutil/internal.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
+#include "libavutil/pixfmt.h"
#include "avcodec.h"
#include "bswapdsp.h"
#include "codec_internal.h"
#include "get_bits.h"
#include "avcodec.h"
#include "bswapdsp.h"
#include "codec_internal.h"
#include "get_bits.h"
-#include "huffyuvdsp.h"
#include "thread.h"
#include "unary.h"
#include "thread.h"
#include "unary.h"
@@
-91,7
+87,7
@@
static int build_vlc(AVCodecContext *avctx, VLC *vlc, const uint32_t *table)
uint8_t xlat[256];
int cur_node, i, j, pos = 0;
uint8_t xlat[256];
int cur_node, i, j, pos = 0;
- ff_
free_vlc
(vlc);
+ ff_
vlc_free
(vlc);
for (i = 0; i < 256; i++) {
nodes[i].count = table[i];
for (i = 0; i < 256; i++) {
nodes[i].count = table[i];
@@
-146,7
+142,7
@@
static int build_vlc(AVCodecContext *avctx, VLC *vlc, const uint32_t *table)
get_tree_codes(bits, lens, xlat, nodes, cur_node - 1, 0, 0, &pos);
get_tree_codes(bits, lens, xlat, nodes, cur_node - 1, 0, 0, &pos);
- return ff_
init_vlc
_sparse(vlc, YLC_VLC_BITS, pos, lens, 2, 2,
+ return ff_
vlc_init
_sparse(vlc, YLC_VLC_BITS, pos, lens, 2, 2,
bits, 4, 4, xlat, 1, 1, 0);
}
bits, 4, 4, xlat, 1, 1, 0);
}
@@
-431,7
+427,7
@@
static int decode_frame(AVCodecContext *avctx, AVFrame *p,
}
p->pict_type = AV_PICTURE_TYPE_I;
}
p->pict_type = AV_PICTURE_TYPE_I;
- p->
key_frame = 1
;
+ p->
flags |= AV_FRAME_FLAG_KEY
;
*got_frame = 1;
return avpkt->size;
*got_frame = 1;
return avpkt->size;
@@
-442,7
+438,7
@@
static av_cold int decode_end(AVCodecContext *avctx)
YLCContext *s = avctx->priv_data;
for (int i = 0; i < FF_ARRAY_ELEMS(s->vlc); i++)
YLCContext *s = avctx->priv_data;
for (int i = 0; i < FF_ARRAY_ELEMS(s->vlc); i++)
- ff_
free_vlc
(&s->vlc[i]);
+ ff_
vlc_free
(&s->vlc[i]);
av_freep(&s->buffer);
s->buffer_size = 0;
av_freep(&s->buffer);
s->buffer_size = 0;
@@
-451,7
+447,7
@@
static av_cold int decode_end(AVCodecContext *avctx)
const FFCodec ff_ylc_decoder = {
.p.name = "ylc",
const FFCodec ff_ylc_decoder = {
.p.name = "ylc",
-
.p.long_name = NULL_IF_CONFIG_SMALL
("YUY2 Lossless Codec"),
+
CODEC_LONG_NAME
("YUY2 Lossless Codec"),
.p.type = AVMEDIA_TYPE_VIDEO,
.p.id = AV_CODEC_ID_YLC,
.priv_data_size = sizeof(YLCContext),
.p.type = AVMEDIA_TYPE_VIDEO,
.p.id = AV_CODEC_ID_YLC,
.priv_data_size = sizeof(YLCContext),
@@
-459,5
+455,4
@@
const FFCodec ff_ylc_decoder = {
.close = decode_end,
FF_CODEC_DECODE_CB(decode_frame),
.p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS,
.close = decode_end,
FF_CODEC_DECODE_CB(decode_frame),
.p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS,
- .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE,
};
};