dilim/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-08-04 15:10:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
e5dfa4361955803ac10911a005803c1e514b6ca7
FFmpeg/libavformat/Makefile
Michael Niedermayer cf95877474 Merge commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb' 
* commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb':
  rtpenc: Merge the h264 and hevc packetizers

Conflicts:
	libavformat/rtpenc_hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-24 23:30:51 +01:00

31 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink