[FFmpeg-cvslog] Merge commit 'c88d245c9866e48cb8a238b7564964c1fcf3315f'

Michael Niedermayer git at videolan.org
Thu Jan 10 12:10:06 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 10 12:02:58 2013 +0100| [dc5767ff0a2a20cd67d4a56d4b1cdd884449409f] | committer: Michael Niedermayer

Merge commit 'c88d245c9866e48cb8a238b7564964c1fcf3315f'

* commit 'c88d245c9866e48cb8a238b7564964c1fcf3315f':
  au: use ff_raw_write_packet()
  au: set stream start time and packet durations

Conflicts:
	libavformat/au.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list