summaryrefslogtreecommitdiffstats
path: root/libavformat/rtpenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-06-10 21:34:15 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-10 21:34:15 +0200
commit3630a075132a8d059b16f92a291e523c1bc7ebc9 (patch)
tree37e9a6cbb8fced1a6e3f34dd348985ff8c081663 /libavformat/rtpenc.c
parent9e724d7216e693ba7af76caee5ccfb98c73d7a4b (diff)
parentbcbb30e2a0f3be3e6b158694687d0fde2f6db625 (diff)
downloadffmpeg-streaming-3630a075132a8d059b16f92a291e523c1bc7ebc9.zip
ffmpeg-streaming-3630a075132a8d059b16f92a291e523c1bc7ebc9.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: libmp3lame: add missing layout terminator avconv: multithreaded demuxing. Bump lavu minor and add an APIChanges entry for audioconvert functions. audioconvert: add a function for extracting the channel with the given index audioconvert: add a function for getting the name of a single channel. audioconvert: add a function for getting channel's index in layout audioconvert: use av_popcount64 in av_get_channel_layout_nb_channels vf_libopencv: add missing headers. iac: add missing dependency Conflicts: configure doc/APIchanges ffmpeg.c libavcodec/libmp3lame.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud