eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 18:10:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
9ba8debce9946b21c20791b0d234443f71e471a0
ffmpeg/libavformat/movenc.h
Michael Niedermayer 802e5fc8f8 Merge commit '1e9db41e2a2166be5671b088ef4ad06a40af459f' 
* commit '1e9db41e2a2166be5671b088ef4ad06a40af459f':
  movenc: Allow override of major brand in ftyp atom

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23 03:22:20 +01:00

5.7 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink