virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-29 05:57:37 +02:00
Code Issues Releases Activity
Files
16a86b443dba748ccbe174b9895a21fc8378889c
FFmpeg/libavformat/rtpenc_chain.h
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

1.1 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink