eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-06 14:15:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
c9a9a7a1fd7e00a838a94e3792235ceb4755648c
ffmpeg/libavformat/movenc.h
Michael Niedermayer 2893d1b36d Merge commit '1d8a0c1b43e58332a3a15c67d4adc161713cade8' 
* commit '1d8a0c1b43e58332a3a15c67d4adc161713cade8':
  movenc: Allow to request not to use edit lists

Conflicts:
	libavformat/movenc.c

See: 537ef8bebf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-08 00:22:42 +01:00

6.1 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink