aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtpenc_chain.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-04 13:01:54 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-04 13:01:54 +0100
commite1cf1a9c89dbb3b867c50421cf543221a4d223f9 (patch)
treeacbed33573df63b7d86f785bb44d875326f59420 /libavformat/rtpenc_chain.c
parentd0b450457b3aeb8c234b0b0a987db55d3485326b (diff)
parenta0b7e289075dccf223b7f407790d8a86fc5d77e8 (diff)
downloadffmpeg-e1cf1a9c89dbb3b867c50421cf543221a4d223f9.tar.gz
Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8'
* commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8': aviobuf: Partial support for reading in read/write contexts build: Avoid detecting bogus components named 'x' Conflicts: libavcodec/allcodecs.c libavdevice/alldevices.c libavformat/allformats.c libavformat/aviobuf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc_chain.c')
0 files changed, 0 insertions, 0 deletions