1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
FFmpeg/libavformat
Michael Niedermayer ad3c5ff347 Merge commit 'e0046bc9c96150fa06146ace9093f06857dd7b23'
* commit 'e0046bc9c96150fa06146ace9093f06857dd7b23':
  movenc: Write the make and model metadata keys for mov style files

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-23 20:33:09 +01:00
..
2015-03-06 21:35:00 +01:00
2015-02-26 02:06:10 +01:00
2015-03-15 23:49:17 +01:00
2015-03-04 23:48:41 +01:00
2015-03-12 15:29:59 +00:00
2015-03-21 23:18:15 +01:00
2015-02-15 18:20:54 +01:00
2015-03-08 02:35:04 +00:00
2015-03-21 23:18:14 +01:00
2015-02-21 23:37:24 +02:00
2015-02-01 20:00:10 +01:00