diff options
| author | Michael Niedermayer <[email protected]> | 2015-03-24 01:45:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-03-24 01:47:01 +0100 |
| commit | d280d43c2666c5f5c0cd346234391cd9f4076e83 (patch) | |
| tree | 87e13b48ce78bacc58e607da9e24f61fe1c4a606 /libavformat/utils.c | |
| parent | cceb737936e69e851977e8471da37d6777ed5a20 (diff) | |
| parent | 592a04054e6423be5050efd2bceece48b10b9c1d (diff) | |
Merge commit '592a04054e6423be5050efd2bceece48b10b9c1d'
* commit '592a04054e6423be5050efd2bceece48b10b9c1d':
pixdesc: Replace a few leftover instances of non AV-prefixed flags
Conflicts:
libavutil/pixdesc.c
See: c7c71f95f8d3e98babf8b6b7f1edc49f14e2c4c4
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions