History

avcodec: add NotchLC decoder

Paul B Mahol committed 6 years ago

Commit cdd06db1 parent b707abf9 files · +494 −1Browse files

Unified · Split

9 files
  1. Changelog +1 −0
  2. libavcodec/Makefile +1 −0
  3. libavcodec/allcodecs.c +1 −0
  4. libavcodec/codec_desc.c +7 −0
  5. libavcodec/codec_id.h +1 −0
  6. libavcodec/notchlc.c +479 −0
  7. libavcodec/version.h +1 −1
  8. libavformat/isom.c +2 −0
  9. libavformat/riff.c +1 −0
Changelog+1−0
@@ -67,6 +67,7 @@ version <next>: · 66 unmodified lines
67- Pro Pinball Series Soundbank demuxer67- Pro Pinball Series Soundbank demuxer
68- pcm_rechunk bitstream filter68- pcm_rechunk bitstream filter
69- scdet filter69- scdet filter
70- NotchLC decoder
70 71
71 72
72version 4.2:73version 4.2:
libavcodec/Makefile+1−0
@@ -506,6 +506,7 @@ OBJS-$(CONFIG_MWSC_DECODER) += mwsc.o · 505 unmodified lines
506OBJS-$(CONFIG_MXPEG_DECODER) += mxpegdec.o506OBJS-$(CONFIG_MXPEG_DECODER) += mxpegdec.o
507OBJS-$(CONFIG_NELLYMOSER_DECODER) += nellymoserdec.o nellymoser.o507OBJS-$(CONFIG_NELLYMOSER_DECODER) += nellymoserdec.o nellymoser.o
508OBJS-$(CONFIG_NELLYMOSER_ENCODER) += nellymoserenc.o nellymoser.o508OBJS-$(CONFIG_NELLYMOSER_ENCODER) += nellymoserenc.o nellymoser.o
509OBJS-$(CONFIG_NOTCHLC_DECODER) += notchlc.o
509OBJS-$(CONFIG_NUV_DECODER) += nuv.o rtjpeg.o510OBJS-$(CONFIG_NUV_DECODER) += nuv.o rtjpeg.o
510OBJS-$(CONFIG_ON2AVC_DECODER) += on2avc.o on2avcdata.o511OBJS-$(CONFIG_ON2AVC_DECODER) += on2avc.o on2avcdata.o
511OBJS-$(CONFIG_OPUS_DECODER) += opusdec.o opus.o opus_celt.o opus_rc.o \512OBJS-$(CONFIG_OPUS_DECODER) += opusdec.o opus.o opus_celt.o opus_rc.o \
libavcodec/allcodecs.c+1−0
@@ -224,6 +224,7 @@ extern AVCodec ff_mvdv_decoder; · 223 unmodified lines
224extern AVCodec ff_mvha_decoder;224extern AVCodec ff_mvha_decoder;
225extern AVCodec ff_mwsc_decoder;225extern AVCodec ff_mwsc_decoder;
226extern AVCodec ff_mxpeg_decoder;226extern AVCodec ff_mxpeg_decoder;
227extern AVCodec ff_notchlc_decoder;
227extern AVCodec ff_nuv_decoder;228extern AVCodec ff_nuv_decoder;
228extern AVCodec ff_paf_video_decoder;229extern AVCodec ff_paf_video_decoder;
229extern AVCodec ff_pam_encoder;230extern AVCodec ff_pam_encoder;
libavcodec/codec_desc.c+7−0
@@ -1763,6 +1763,13 @@ static const AVCodecDescriptor codec_descriptors[] = { · 1762 unmodified lines
1763 .long_name = NULL_IF_CONFIG_SMALL("MidiVid 3.0"),1763 .long_name = NULL_IF_CONFIG_SMALL("MidiVid 3.0"),
1764 .props = AV_CODEC_PROP_LOSSY,1764 .props = AV_CODEC_PROP_LOSSY,
1765 },1765 },
1766 {
1767 .id = AV_CODEC_ID_NOTCHLC,
1768 .type = AVMEDIA_TYPE_VIDEO,
1769 .name = "notchlc",
1770 .long_name = NULL_IF_CONFIG_SMALL("NotchLC"),
1771 .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
1772 },
1766 1773
1767 /* various PCM "codecs" */1774 /* various PCM "codecs" */
1768 {1775 {
libavcodec/codec_id.h+1−0
@@ -291,6 +291,7 @@ enum AVCodecID { · 290 unmodified lines
291 AV_CODEC_ID_MVHA,291 AV_CODEC_ID_MVHA,
292 AV_CODEC_ID_CDTOONS,292 AV_CODEC_ID_CDTOONS,
293 AV_CODEC_ID_MV30,293 AV_CODEC_ID_MV30,
294 AV_CODEC_ID_NOTCHLC,
294 295
295 /* various PCM "codecs" */296 /* various PCM "codecs" */
296 AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs297 AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
libavcodec/notchlc.c+479−0
@@ -0,0 +1,479 @@
1/*
2 * NotchLC decoder
3 * Copyright (c) 2020 Paul B Mahol
4 *
5 * This file is part of FFmpeg.
6 *
7 * FFmpeg is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version.
11 *
12 * FFmpeg is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * Lesser General Public License for more details.
16 *
17 * You should have received a copy of the GNU Lesser General Public
18 * License along with FFmpeg; if not, write to the Free Software
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 */
21
22#include <stdio.h>
23#include <stdlib.h>
24#include <string.h>
25
26#define BITSTREAM_READER_LE
27#include "libavutil/intreadwrite.h"
28#include "avcodec.h"
29#include "bytestream.h"
30#include "get_bits.h"
31#include "internal.h"
32#include "lzf.h"
33#include "thread.h"
34
35typedef struct NotchLCContext {
36 unsigned compressed_size;
37 unsigned format;
38
39 uint8_t *uncompressed_buffer;
40 unsigned uncompressed_size;
41
42 uint8_t *lzf_buffer;
43 int64_t lzf_size;
44
45 unsigned texture_size_x;
46 unsigned texture_size_y;
47 unsigned y_data_row_offsets;
48 unsigned uv_offset_data_offset;
49 unsigned y_control_data_offset;
50 unsigned a_control_word_offset;
51 unsigned y_data_offset;
52 unsigned uv_data_offset;
53 unsigned y_data_size;
54 unsigned uv_count_size;
55 unsigned uv_count_offset;
56 unsigned a_count_size;
57 unsigned data_end;
58
59 GetByteContext gb;
60 PutByteContext pb;
61} NotchLCContext;
62
63static av_cold int decode_init(AVCodecContext *avctx)
64{
65 avctx->pix_fmt = AV_PIX_FMT_YUV444P12;
66 avctx->color_range = AVCOL_RANGE_JPEG;
67 avctx->colorspace = AVCOL_SPC_RGB;
68 avctx->color_primaries = AVCOL_PRI_BT709;
69 avctx->color_trc = AVCOL_TRC_IEC61966_2_1;
70
71 return 0;
72}
73
74#define HISTORY_SIZE (64 * 1024)
75
76static int lz4_decompress(AVCodecContext *avctx,
77 GetByteContext *gb,
78 PutByteContext *pb)
79{
80 unsigned reference_pos, match_length, delta, pos = 0;
81 uint8_t history[64 * 1024];
82
83 while (bytestream2_get_bytes_left(gb) > 0) {
84 uint8_t token = bytestream2_get_byte(gb);
85 unsigned num_literals = token >> 4;
86
87 if (num_literals == 15) {
88 unsigned char current;
89 do {
90 current = bytestream2_get_byte(gb);
91 num_literals += current;
92 } while (current == 255);
93 }
94
95 if (pos + num_literals < HISTORY_SIZE) {
96 bytestream2_get_buffer(gb, history + pos, num_literals);
97 pos += num_literals;
98 } else {
99 while (num_literals-- > 0) {
100 history[pos++] = bytestream2_get_byte(gb);
101 if (pos == HISTORY_SIZE) {
102 bytestream2_put_buffer(pb, history, HISTORY_SIZE);
103 pos = 0;
104 }
105 }
106 }
107
108 if (bytestream2_get_bytes_left(gb) <= 0)
109 break;
110
111 delta = bytestream2_get_byte(gb);
112 delta |= (unsigned)bytestream2_get_byte(gb) << 8;
113 if (delta == 0)
114 return 0;
115 match_length = 4 + (token & 0x0F);
116 if (match_length == 4 + 0x0F) {
117 uint8_t current;
118
119 do {
120 current = bytestream2_get_byte(gb);
121 match_length += current;
122 } while (current == 255);
123 }
124 reference_pos = (pos >= delta) ? (pos - delta) : (HISTORY_SIZE + pos - delta);
125 if (pos + match_length < HISTORY_SIZE && reference_pos + match_length < HISTORY_SIZE) {
126 if (pos >= reference_pos + match_length || reference_pos >= pos + match_length) {
127 memcpy(history + pos, history + reference_pos, match_length);
128 pos += match_length;
129 } else {
130 while (match_length-- > 0)
131 history[pos++] = history[reference_pos++];
132 }
133 } else {
134 while (match_length-- > 0) {
135 history[pos++] = history[reference_pos++];
136 if (pos == HISTORY_SIZE) {
137 bytestream2_put_buffer(pb, history, HISTORY_SIZE);
138 pos = 0;
139 }
140 reference_pos %= HISTORY_SIZE;
141 }
142 }
143 }
144
145 bytestream2_put_buffer(pb, history, pos);
146
147 return bytestream2_tell_p(pb);
148}
149
150static int decode_blocks(AVCodecContext *avctx, AVFrame *p, ThreadFrame *frame,
151 unsigned uncompressed_size)
152{
153 NotchLCContext *s = avctx->priv_data;
154 GetByteContext rgb, dgb, *gb = &s->gb;
155 GetBitContext bit;
156 int ylinesize, ulinesize, vlinesize, alinesize;
157 uint16_t *dsty, *dstu, *dstv, *dsta;
158 int ret;
159
160 s->texture_size_x = bytestream2_get_le32(gb);
161 s->texture_size_y = bytestream2_get_le32(gb);
162
163 ret = ff_set_dimensions(avctx, s->texture_size_x, s->texture_size_y);
164 if (ret < 0)
165 return ret;
166
167 s->uv_offset_data_offset = bytestream2_get_le32(gb);
168 if (s->uv_offset_data_offset >= UINT_MAX / 4)
169 return AVERROR_INVALIDDATA;
170 s->uv_offset_data_offset *= 4;
171 if (s->uv_offset_data_offset >= uncompressed_size)
172 return AVERROR_INVALIDDATA;
173
174 s->y_control_data_offset = bytestream2_get_le32(gb);
175 if (s->y_control_data_offset >= UINT_MAX / 4)
176 return AVERROR_INVALIDDATA;
177 s->y_control_data_offset *= 4;
178 if (s->y_control_data_offset >= uncompressed_size)
179 return AVERROR_INVALIDDATA;
180
181 s->a_control_word_offset = bytestream2_get_le32(gb);
182 if (s->a_control_word_offset >= UINT_MAX / 4)
183 return AVERROR_INVALIDDATA;
184 s->a_control_word_offset *= 4;
185 if (s->a_control_word_offset >= uncompressed_size)
186 return AVERROR_INVALIDDATA;
187
188 s->uv_data_offset = bytestream2_get_le32(gb);
189 if (s->uv_data_offset >= UINT_MAX / 4)
190 return AVERROR_INVALIDDATA;
191 s->uv_data_offset *= 4;
192 if (s->uv_data_offset >= uncompressed_size)
193 return AVERROR_INVALIDDATA;
194
195 s->y_data_size = bytestream2_get_le32(gb);
196 if (s->y_data_size >= UINT_MAX / 4)
197 return AVERROR_INVALIDDATA;
198
199 s->uv_count_size = bytestream2_get_le32(gb);
200 if (s->uv_count_size >= UINT_MAX / 4)
201 return AVERROR_INVALIDDATA;
202 s->uv_count_size *= 4;
203 if (s->uv_count_size >= uncompressed_size)
204 return AVERROR_INVALIDDATA;
205
206 s->a_count_size = bytestream2_get_le32(gb);
207 if (s->a_count_size >= UINT_MAX / 4)
208 return AVERROR_INVALIDDATA;
209 s->a_count_size *= 4;
210 if (s->a_count_size >= uncompressed_size)
211 return AVERROR_INVALIDDATA;
212
213 s->data_end = bytestream2_get_le32(gb);
214 if (s->data_end > uncompressed_size)
215 return AVERROR_INVALIDDATA;
216
217 s->y_data_row_offsets = bytestream2_tell(gb);
218 if (s->data_end <= s->y_data_size)
219 return AVERROR_INVALIDDATA;
220 s->y_data_offset = s->data_end - s->y_data_size;
221 if (s->y_data_offset <= s->uv_count_size)
222 return AVERROR_INVALIDDATA;
223 s->uv_count_offset = s->y_data_offset - s->uv_count_size;
224
225 if ((ret = ff_thread_get_buffer(avctx, frame, 0)) < 0)
226 return ret;
227
228 rgb = *gb;
229 dgb = *gb;
230 bytestream2_seek(&rgb, s->y_data_row_offsets, SEEK_SET);
231 bytestream2_seek(gb, s->y_control_data_offset, SEEK_SET);
232
233 dsty = (uint16_t *)p->data[0];
234 dsta = (uint16_t *)p->data[3];
235 ylinesize = p->linesize[0] / 2;
236 alinesize = p->linesize[3] / 2;
237
238 for (int y = 0; y < avctx->height; y += 4) {
239 const unsigned row_offset = bytestream2_get_le32(&rgb);
240
241 bytestream2_seek(&dgb, s->y_data_offset + row_offset, SEEK_SET);
242
243 init_get_bits8(&bit, dgb.buffer, bytestream2_get_bytes_left(&dgb));
244 for (int x = 0; x < avctx->width; x += 4) {
245 unsigned item = bytestream2_get_le32(gb);
246 unsigned y_min = item & 4095;
247 unsigned y_max = (item >> 12) & 4095;
248 unsigned y_diff = y_max - y_min;
249 unsigned control[4];
250
251 control[0] = (item >> 24) & 3;
252 control[1] = (item >> 26) & 3;
253 control[2] = (item >> 28) & 3;
254 control[3] = (item >> 30) & 3;
255
256 for (int i = 0; i < 4; i++) {
257 const int nb_bits = control[i] + 1;
258 const int div = (1 << nb_bits) - 1;
259 const int add = div - 1;
260
261 dsty[x + i * ylinesize + 0] = av_clip_uintp2(y_min + ((y_diff * get_bits(&bit, nb_bits) + add) / div), 12);
262 dsty[x + i * ylinesize + 1] = av_clip_uintp2(y_min + ((y_diff * get_bits(&bit, nb_bits) + add) / div), 12);
263 dsty[x + i * ylinesize + 2] = av_clip_uintp2(y_min + ((y_diff * get_bits(&bit, nb_bits) + add) / div), 12);
264 dsty[x + i * ylinesize + 3] = av_clip_uintp2(y_min + ((y_diff * get_bits(&bit, nb_bits) + add) / div), 12);
265 }
266 }
267
268 dsty += 4 * ylinesize;
269 dsta += 4 * alinesize;
270 }
271
272 rgb = *gb;
273 dgb = *gb;
274 bytestream2_seek(&rgb, s->uv_offset_data_offset, SEEK_SET);
275 bytestream2_seek(gb, s->a_control_word_offset, SEEK_SET);
276
277 dstu = (uint16_t *)p->data[1];
278 dstv = (uint16_t *)p->data[2];
279 ulinesize = p->linesize[1] / 2;
280 vlinesize = p->linesize[2] / 2;
281
282 for (int y = 0; y < avctx->height; y += 16) {
283 for (int x = 0; x < avctx->width; x += 16) {
284 unsigned offset = bytestream2_get_le32(&rgb) * 4;
285 int u[16][16] = { 0 }, v[16][16] = { 0 };
286 int u0, v0, u1, v1, udif, vdif;
287 unsigned escape, is8x8, loc;
288
289 bytestream2_seek(&dgb, s->uv_data_offset + offset, SEEK_SET);
290
291 is8x8 = bytestream2_get_le16(&dgb);
292 escape = bytestream2_get_le16(&dgb);
293
294 if (escape == 0 && is8x8 == 0) {
295 u0 = bytestream2_get_byte(&dgb);
296 v0 = bytestream2_get_byte(&dgb);
297 u1 = bytestream2_get_byte(&dgb);
298 v1 = bytestream2_get_byte(&dgb);
299 loc = bytestream2_get_le32(&dgb);
300 u0 = (u0 << 4) | (u0 & 0xF);
301 v0 = (v0 << 4) | (v0 & 0xF);
302 u1 = (u1 << 4) | (u1 & 0xF);
303 v1 = (v1 << 4) | (v1 & 0xF);
304 udif = u1 - u0;
305 vdif = v1 - v0;
306
307 for (int i = 0; i < 16; i += 4) {
308 for (int j = 0; j < 16; j += 4) {
309 for (int ii = 0; ii < 4; ii++) {
310 for (int jj = 0; jj < 4; jj++) {
311 u[i + ii][j + jj] = u0 + ((udif * (int)(loc & 3) + 2) / 3);
312 v[i + ii][j + jj] = v0 + ((vdif * (int)(loc & 3) + 2) / 3);
313 }
314 }
315
316 loc >>= 2;
317 }
318 }
319 } else {
320 for (int i = 0; i < 16; i += 8) {
321 for (int j = 0; j < 16; j += 8) {
322 if (is8x8 & 1) {
323 u0 = bytestream2_get_byte(&dgb);
324 v0 = bytestream2_get_byte(&dgb);
325 u1 = bytestream2_get_byte(&dgb);
326 v1 = bytestream2_get_byte(&dgb);
327 loc = bytestream2_get_le32(&dgb);
328 u0 = (u0 << 4) | (u0 & 0xF);
329 v0 = (v0 << 4) | (v0 & 0xF);
330 u1 = (u1 << 4) | (u1 & 0xF);
331 v1 = (v1 << 4) | (v1 & 0xF);
332 udif = u1 - u0;
333 vdif = v1 - v0;
334
335 for (int ii = 0; ii < 8; ii += 2) {
336 for (int jj = 0; jj < 8; jj += 2) {
337 for (int iii = 0; iii < 2; iii++) {
338 for (int jjj = 0; jjj < 2; jjj++) {
339 u[i + ii + iii][j + jj + jjj] = u0 + ((udif * (int)(loc & 3) + 2) / 3);
340 v[i + ii + iii][j + jj + jjj] = v0 + ((vdif * (int)(loc & 3) + 2) / 3);
341 }
342 }
343
344 loc >>= 2;
345 }
346 }
347 } else if (escape) {
348 for (int ii = 0; ii < 8; ii += 4) {
349 for (int jj = 0; jj < 8; jj += 4) {
350 u0 = bytestream2_get_byte(&dgb);
351 v0 = bytestream2_get_byte(&dgb);
352 u1 = bytestream2_get_byte(&dgb);
353 v1 = bytestream2_get_byte(&dgb);
354 loc = bytestream2_get_le32(&dgb);
355 u0 = (u0 << 4) | (u0 & 0xF);
356 v0 = (v0 << 4) | (v0 & 0xF);
357 u1 = (u1 << 4) | (u1 & 0xF);
358 v1 = (v1 << 4) | (v1 & 0xF);
359 udif = u1 - u0;
360 vdif = v1 - v0;
361
362 for (int iii = 0; iii < 4; iii++) {
363 for (int jjj = 0; jjj < 4; jjj++) {
364 u[i + ii + iii][j + jj + jjj] = u0 + ((udif * (int)(loc & 3) + 2) / 3);
365 v[i + ii + iii][j + jj + jjj] = v0 + ((vdif * (int)(loc & 3) + 2) / 3);
366
367 loc >>= 2;
368 }
369 }
370 }
371 }
372 }
373
374 is8x8 >>= 1;
375 }
376 }
377 }
378
379 for (int i = 0; i < 16; i++) {
380 for (int j = 0; j < 16; j++) {
381 dstu[x + i * ulinesize + j] = u[i][j];
382 dstv[x + i * vlinesize + j] = v[i][j];
383 }
384 }
385 }
386
387 dstu += 16 * ulinesize;
388 dstv += 16 * vlinesize;
389 }
390
391 return 0;
392}
393
394static int decode_frame(AVCodecContext *avctx,
395 void *data, int *got_frame,
396 AVPacket *avpkt)
397{
398 NotchLCContext *s = avctx->priv_data;
399 ThreadFrame frame = { .f = data };
400 GetByteContext *gb = &s->gb;
401 PutByteContext *pb = &s->pb;
402 unsigned uncompressed_size;
403 AVFrame *p = data;
404 int ret;
405
406 if (avpkt->size <= 40)
407 return AVERROR_INVALIDDATA;
408
409 bytestream2_init(gb, avpkt->data, avpkt->size);
410
411 if (bytestream2_get_le32(gb) != MKBETAG('N','L','C','1'))
412 return AVERROR_INVALIDDATA;
413
414 uncompressed_size = bytestream2_get_le32(gb);
415 s->compressed_size = bytestream2_get_le32(gb);
416 s->format = bytestream2_get_le32(gb);
417
418 if (s->format > 2)
419 return AVERROR_PATCHWELCOME;
420
421 if (s->format == 0) {
422 ret = ff_lzf_uncompress(gb, &s->lzf_buffer, &s->lzf_size);
423 if (ret < 0)
424 return ret;
425
426 if (uncompressed_size > s->lzf_size)
427 return AVERROR_INVALIDDATA;
428
429 bytestream2_init(gb, s->lzf_buffer, uncompressed_size);
430 } else if (s->format == 1) {
431 av_fast_padded_malloc(&s->uncompressed_buffer, &s->uncompressed_size,
432 uncompressed_size);
433 if (!s->uncompressed_buffer)
434 return AVERROR(ENOMEM);
435
436 bytestream2_init_writer(pb, s->uncompressed_buffer, s->uncompressed_size);
437
438 ret = lz4_decompress(avctx, gb, pb);
439 if (ret != uncompressed_size)
440 return AVERROR_INVALIDDATA;
441
442 bytestream2_init(gb, s->uncompressed_buffer, uncompressed_size);
443 }
444
445 ret = decode_blocks(avctx, p, &frame, uncompressed_size);
446 if (ret < 0)
447 return ret;
448
449 p->pict_type = AV_PICTURE_TYPE_I;
450 p->key_frame = 1;
451
452 *got_frame = 1;
453
454 return avpkt->size;
455}
456
457static av_cold int decode_end(AVCodecContext *avctx)
458{
459 NotchLCContext *s = avctx->priv_data;
460
461 av_freep(&s->uncompressed_buffer);
462 s->uncompressed_size = 0;
463 av_freep(&s->lzf_buffer);
464 s->lzf_size = 0;
465
466 return 0;
467}
468
469AVCodec ff_notchlc_decoder = {
470 .name = "notchlc",
471 .long_name = NULL_IF_CONFIG_SMALL("NotchLC"),
472 .type = AVMEDIA_TYPE_VIDEO,
473 .id = AV_CODEC_ID_NOTCHLC,
474 .priv_data_size = sizeof(NotchLCContext),
475 .init = decode_init,
476 .close = decode_end,
477 .decode = decode_frame,
478 .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS,
479};
libavcodec/version.h+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
28#include "libavutil/version.h"28#include "libavutil/version.h"
29 29
30#define LIBAVCODEC_VERSION_MAJOR 5830#define LIBAVCODEC_VERSION_MAJOR 58
31#define LIBAVCODEC_VERSION_MINOR 8431#define LIBAVCODEC_VERSION_MINOR 85
32#define LIBAVCODEC_VERSION_MICRO 10032#define LIBAVCODEC_VERSION_MICRO 100
33 33
34#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \34#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
libavformat/isom.c+2−0
@@ -313,6 +313,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = { · 312 unmodified lines
313 313
314 { AV_CODEC_ID_PIXLET, MKTAG('p', 'x', 'l', 't') },314 { AV_CODEC_ID_PIXLET, MKTAG('p', 'x', 'l', 't') },
315 315
316 { AV_CODEC_ID_NOTCHLC, MKTAG('n', 'c', 'l', 'c') },
317
316 { AV_CODEC_ID_NONE, 0 },318 { AV_CODEC_ID_NONE, 0 },
317};319};
318 320
libavformat/riff.c+1−0
@@ -493,6 +493,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { · 492 unmodified lines
493 { AV_CODEC_ID_MVDV, MKTAG('M', 'V', 'D', 'V') },493 { AV_CODEC_ID_MVDV, MKTAG('M', 'V', 'D', 'V') },
494 { AV_CODEC_ID_MVHA, MKTAG('M', 'V', 'H', 'A') },494 { AV_CODEC_ID_MVHA, MKTAG('M', 'V', 'H', 'A') },
495 { AV_CODEC_ID_MV30, MKTAG('M', 'V', '3', '0') },495 { AV_CODEC_ID_MV30, MKTAG('M', 'V', '3', '0') },
496 { AV_CODEC_ID_NOTCHLC, MKTAG('n', 'l', 'c', '1') },
496 { AV_CODEC_ID_NONE, 0 }497 { AV_CODEC_ID_NONE, 0 }
497};498};
498 499

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t