* commit 'f05e9beb':
  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>