[FFmpeg-cvslog] Merge commit '174c5fde90060faab67796a5eaef742630f1db6e'

Michael Niedermayer git at videolan.org
Mon Dec 8 22:32:24 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  8 22:13:23 2014 +0100| [420aebf0c585e54468e631460065448c9bb6ccb5] | committer: Michael Niedermayer

Merge commit '174c5fde90060faab67796a5eaef742630f1db6e'

* commit '174c5fde90060faab67796a5eaef742630f1db6e':
  mov: parse @PRM and @PRQ metadata tags

Conflicts:
	libavformat/mov.c

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

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





More information about the ffmpeg-cvslog mailing list