diff options
| author | Michael Niedermayer <[email protected]> | 2015-01-18 03:22:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-01-18 03:22:15 +0100 |
| commit | 02d979d0074a8ec6f6650c8262e15ac50d2b97ce (patch) | |
| tree | 0f3de2754863e87fdfe65b81dd8b131056f17241 /libavfilter/libmpcodecs/vfcap.h | |
| parent | fb62580fb6cb3f9dfa684b52a8c0a747d1f29167 (diff) | |
| parent | 88411b87b4bb3c5820ec232f26ba4a284c11a7f9 (diff) | |
Merge commit '88411b87b4bb3c5820ec232f26ba4a284c11a7f9' into release/2.4
* commit '88411b87b4bb3c5820ec232f26ba4a284c11a7f9':
display: fix order of operands
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavfilter/libmpcodecs/vfcap.h')
0 files changed, 0 insertions, 0 deletions