eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-20 05:50:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
c9659dfd294211e3b95d6a5115466fde4acdd51a
ffmpeg/libavformat/movenc.c
Michael Niedermayer efe259a27e Merge commit '29d61d73b1cbf0dcd1f79bc49c7df01b0a377c85' into release/2.2 
* commit '29d61d73b1cbf0dcd1f79bc49c7df01b0a377c85':
  movenc: Allow override of major brand in ftyp atom

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23 04:05:56 +01:00

155 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink