On Thu, Jun 9, 2016 at 11:12 AM, Diego Biurrun <di...@biurrun.de> wrote: > From: Alexandra Hájková <alexan...@khirnov.net> > > --- > libavformat/mov.c | 10 ++++++---- > libavformat/movenc.c | 41 +++++++++++++++++++++-------------------- > 2 files changed, 27 insertions(+), 24 deletions(-) > > @@ -461,28 +462,28 @@ static int mov_write_dvc1_structs(MOVTrack *track, > uint8_t *buf) > return AVERROR(ENOMEM); > start = find_next_marker(track->vos_data, end); > for (next = start; next < end; start = next) { > - GetBitContext gb; > + BitstreamContext bc; > int size; > next = find_next_marker(start + 4, end); > size = next - start - 4; > if (size <= 0) > continue; > unescaped_size = vc1_unescape_buffer(start + 4, size, unescaped); > - init_get_bits(&gb, unescaped, 8 * unescaped_size); > + bitstream_init(&bc, unescaped, 8 * unescaped_size); > if (AV_RB32(start) == VC1_CODE_SEQHDR) { > - int profile = get_bits(&gb, 2); > + int profile = bitstream_read(&bc, 2); > if (profile != PROFILE_ADVANCED) { > av_free(unescaped); > return AVERROR(ENOSYS); > } > seq_found = 1; > - level = get_bits(&gb, 3); > + level = bitstream_read(&bc, 3); > /* chromaformat, frmrtq_postproc, bitrtq_postproc, postprocflag, > * width, height */ > - skip_bits_long(&gb, 2 + 3 + 5 + 1 + 2*12); > - skip_bits(&gb, 1); /* broadcast */ > - interlace = get_bits1(&gb); > - skip_bits(&gb, 4); /* tfcntrflag, finterpflag, reserved, psf */ > + bitstream_skip(&bc, 2 + 3 + 5 + 1 + 2*12);
nit: 2 * 12? ok regardless -- Vittorio _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel