aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/fmtconvert.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-30 21:07:32 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-30 21:07:56 +0200
commitd03fd2c8052ee80e7221ab02ab0fcb5220e92698 (patch)
tree443758956fe57368f9372afd061d8809fafd8a37 /libavcodec/fmtconvert.h
parent946a106995bca70a360f5bd03fa503e8beb09cc5 (diff)
parent124ec8b1303d4f29b833099ce9008e31ac6d7c86 (diff)
downloadffmpeg-d03fd2c8052ee80e7221ab02ab0fcb5220e92698.tar.gz
Merge commit '124ec8b1303d4f29b833099ce9008e31ac6d7c86' into release/1.1
* commit '124ec8b1303d4f29b833099ce9008e31ac6d7c86': pulse: Add a wallclock option to be compatible with other other captures Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/fmtconvert.h')
0 files changed, 0 insertions, 0 deletions