diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-09 23:01:32 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-09 23:02:07 +0400 |
| commit | 5b23c7ed6fa9ac99894621fefd2d18b27704913e (patch) | |
| tree | caa9b73c2721e7250547423039b7ab9ca250b3ab | |
| parent | ffe987b96dd4e8d39be094142c859664106b6b45 (diff) | |
| parent | bc3f03567a04a9f7e412bcf2ca09c163f3f13941 (diff) | |
Merge commit 'bc3f03567a04a9f7e412bcf2ca09c163f3f13941'
* commit 'bc3f03567a04a9f7e412bcf2ca09c163f3f13941':
g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO
Conflicts:
libavcodec/g2meet.c
See: cb2162adba4041951c987f9f365957e067b28a97
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions