diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 22:05:20 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 22:05:25 +0200 |
commit | 83e3516e64dcc1581ae7503be3aaca6a34be7194 (patch) | |
tree | d2c8b6abe6b91cfc783185490f3dddcf55415501 /.gitattributes | |
parent | 3244a176505b04f62f7bbb1ac7fb413399a6790c (diff) | |
parent | 925b80d64029d41962e5998d7d901226c3a9baea (diff) | |
download | ffmpeg-83e3516e64dcc1581ae7503be3aaca6a34be7194.tar.gz |
Merge commit '925b80d64029d41962e5998d7d901226c3a9baea'
* commit '925b80d64029d41962e5998d7d901226c3a9baea':
mpegvideo: Move OutFormat enum to mpegutils.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions