eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-14 19:10:09 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
5b76c82fd7a5f4f36bb901b8c43d7f7319599599
ffmpeg/libavformat/nut.h
Michael Niedermayer efcf8cfa48 Merge commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07' 
* commit '24ad3ac6a3e20350214e6c3f7a931635f264ae07':
  nut: Drop doxygen markers

Conflicts:
	libavformat/nut.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-15 21:41:20 +02:00

4.9 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink