Merge commit 'f05e9beb4ab5fb8b9d5ba81405e9fca901832591'

* 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>

diff --cc tools/ismindex.c
index 803c5b7,0a01c90..66e0a8c
--- 1/tools/ismindex.c
--- 2/tools/ismindex.c
+++ b/tools/ismindex.c
@@@ -251,12 -249,9 +251,12 @@@ static int get_video_private_data(struc
      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]);