aboutsummaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-10 09:18:16 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-10 09:19:05 +0200
commitf18db82f291ced9ae07765a12afc8a47c89ee2b7 (patch)
tree2872b8a59710e658292382697ea142209fdbf001 /README
parent7824b5f6f5b6200f362017960de413748d917a06 (diff)
parent61cd19b8bc32185c8caf64d89d1b0909877a0707 (diff)
downloadffmpeg-f18db82f291ced9ae07765a12afc8a47c89ee2b7.tar.gz
Merge commit '61cd19b8bc32185c8caf64d89d1b0909877a0707'
* commit '61cd19b8bc32185c8caf64d89d1b0909877a0707': vmnc: Port to bytestream2 Conflicts: libavcodec/vmnc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions