aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/g2meet.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-08 00:41:51 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-08 01:04:04 +0100
commitc9a9a7a1fd7e00a838a94e3792235ceb4755648c (patch)
tree46ce16501fce2cc79d419266255fa501db9d53cf /libavcodec/g2meet.c
parente2e36a739d3ad0d207a31c76f414a912d08b1d6d (diff)
parent9cbf70fa0e44613590b019cef1fe99aa3f3c5d9d (diff)
downloadffmpeg-c9a9a7a1fd7e00a838a94e3792235ceb4755648c.tar.gz
Merge commit '9cbf70fa0e44613590b019cef1fe99aa3f3c5d9d'
* commit '9cbf70fa0e44613590b019cef1fe99aa3f3c5d9d': movenc: Write correct presentation timestamps in tfra Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g2meet.c')
0 files changed, 0 insertions, 0 deletions