virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity
Files
ece5decbe052cac40eef8f3682a6bf7c8fa6bc4b
FFmpeg/libavformat/rtpenc.c
Michael Niedermayer a9b1536a01 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  bgmc: Fix av_malloc checks in ff_bgmc_init()
  rtp: set the payload type as stream id

Conflicts:
	libavformat/rtpenc_chain.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-15 11:31:13 +01:00

19 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink