eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-15 19:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
07de0db74b56a5cb45039b58b6ff43ea5ffb90bc
ffmpeg/libavformat/movenc.c
Michael Niedermayer ddc6adaa28 Merge commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2' 
* commit '4d55e9de27894ddfb337b28cd7aa6d14a12666d2':
  vc1: Split bits used in libavformat into a separate header

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-04 20:09:01 +02:00

165 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink