highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
dcda5ef1eab52a2392fd8f9ebf51a03052ddfce2
ffmpeg/libavcodec/internal.h
Michael Niedermayer 4cf4da9dc5 Merge commit '5b4797a21db900b7d509660b7a4d49829089b004' 
* commit '5b4797a21db900b7d509660b7a4d49829089b004':
  avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.

Conflicts:
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-05 22:12:41 +01:00

7.4 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink