diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 16:56:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 16:56:40 +0200 |
| commit | e40ae8cc00ae7e485a64a5b3b40b73dbfd32b631 (patch) | |
| tree | 4d1174389c3fc1fb3d8e1dafd0e6b7ba6fc4655f /libavformat/oma.c | |
| parent | 185164398763b76729d6169bea35d08c48d1d32f (diff) | |
| parent | 6484149158b6fc6d13d2b2ef84cb26a2d3275400 (diff) | |
| download | ffmpeg-e40ae8cc00ae7e485a64a5b3b40b73dbfd32b631.tar.gz | |
Merge commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400'
* commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400':
lavc: make the xvid-specific "gmc" flag a private option of libxvid
Conflicts:
libavcodec/libxvid.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/oma.c')
0 files changed, 0 insertions, 0 deletions