[FFmpeg-cvslog] Merge commit '08504380ddf25d6905e189e9bf52e7a4c771a415'

Michael Niedermayer git at videolan.org
Mon Aug 26 13:38:12 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 26 13:28:04 2013 +0200| [e299aa78d955aec21f46748a401dfbd313dd79e9] | committer: Michael Niedermayer

Merge commit '08504380ddf25d6905e189e9bf52e7a4c771a415'

* commit '08504380ddf25d6905e189e9bf52e7a4c771a415':
  mov: Refactor codec specific final steps in mov_finalize_stsd_codec

Conflicts:
	libavformat/mov.c

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

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





More information about the ffmpeg-cvslog mailing list