eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 01:40:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
1036a1b8a31d879d773922f9e24ebe310bb573e1
ffmpeg/libavformat/rtpenc.h
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

4.1 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink