highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
b5939ba09cfae67ee6394dc0de3ee9bee84c9123
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