Michael Niedermayer 33ecf7ab59 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>
2013-03-14 11:48:42 +01:00
..
2012-10-26 18:24:50 +02:00
2013-03-07 01:12:04 +01:00
2012-10-24 22:25:43 +02:00
2013-01-15 22:50:19 +01:00
2013-02-24 13:12:46 +01:00
2012-10-13 20:35:56 +02:00
2012-09-15 15:40:36 -04:00