* commit '
f05e9beb4ab5fb8b9d5ba81405e9fca901832591':
ismindex: Rename structs and fields from "file" to "track"
avpacket: copy side data type and size in av_dup_packet
Conflicts:
libavcodec/avpacket.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
int err = AVERROR(EINVAL);
if (codec->codec_id == AV_CODEC_ID_VC1)
- return get_private_data(vf, codec);
+ return get_private_data(track, codec);
- avio_open_dyn_buf(&io);
+ if (avio_open_dyn_buf(&io) < 0) {
+ err = AVERROR(ENOMEM);
+ goto fail;
+ }
if (codec->extradata_size < 11 || codec->extradata[0] != 1)
goto fail;
sps_size = AV_RB16(&codec->extradata[6]);