1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavformat
Michael Niedermayer 1468ff49df Merge commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e'
* commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e':
  movenc: Keep writing zero-entry stts atoms as intended

Conflicts:
	libavformat/movenc.c

See: 95165f7c1b533c121b890fa1e82e8ed596cfc108
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-06 20:57:11 +01:00
..
2015-02-26 02:06:10 +01:00
2015-03-05 23:08:38 +01:00
2015-03-04 23:48:41 +01:00
2015-02-17 12:16:43 -05:00
2015-02-15 18:20:54 +01:00
2015-02-21 23:37:24 +02:00
2015-02-04 13:10:53 +00:00
2015-03-05 00:09:26 +01:00