aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rtpenc_mpv.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-14 20:09:44 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-14 20:10:08 +0200
commitee69229dd806709a51b70184640c2f298cd99d2b (patch)
tree6bd12e2b869d3e8d5f0a97a9d70d44d8b39a6506 /libavformat/rtpenc_mpv.c
parent64b37d3e08e48419c85f35724d119267e89d575d (diff)
parent7a5f44476696b495e0de658ed859bcb8520b93d4 (diff)
downloadffmpeg-ee69229dd806709a51b70184640c2f298cd99d2b.tar.gz
Merge commit '7a5f44476696b495e0de658ed859bcb8520b93d4'
* commit '7a5f44476696b495e0de658ed859bcb8520b93d4': avisynth: Bump minimum required version to interface version 6 Conflicts: doc/general.texi libavformat/avisynth.c See: 3723a183103718352b37ec2617f71e96ee2c3846 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc_mpv.c')
0 files changed, 0 insertions, 0 deletions