[FFmpeg-cvslog] Merge commit 'f05e9beb4ab5fb8b9d5ba81405e9fca901832591'

Michael Niedermayer git at videolan.org
Thu Mar 14 11:56:29 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 14 11:48:42 2013 +0100| [33ecf7ab5980c7b113b25cb650418ee5d4589490] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=33ecf7ab5980c7b113b25cb650418ee5d4589490
---





More information about the ffmpeg-cvslog mailing list