diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 04:05:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 04:05:56 +0100 |
| commit | efe259a27e56ae2f68b924a7d24b08b69b3badc8 (patch) | |
| tree | 0ab9c9ba528b0c7a02c0bb3834f1933780f5436b /configure | |
| parent | 49f11e12d5afa9cd800f3e2f753d83595d5cff5c (diff) | |
| parent | 29d61d73b1cbf0dcd1f79bc49c7df01b0a377c85 (diff) | |
| download | ffmpeg-efe259a27e56ae2f68b924a7d24b08b69b3badc8.tar.gz | |
Merge commit '29d61d73b1cbf0dcd1f79bc49c7df01b0a377c85' into release/2.2
* commit '29d61d73b1cbf0dcd1f79bc49c7df01b0a377c85':
movenc: Allow override of major brand in ftyp atom
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
0 files changed, 0 insertions, 0 deletions