diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-03 01:04:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-03 01:04:14 +0200 |
| commit | 0ba65c9f795a1d3ad842f6d3179472e35c73541c (patch) | |
| tree | 3ee27fb796ef6856c1e412156055d61556780c25 /libavdevice/opengl_enc.c | |
| parent | a72b61a317b0bca3e8e9c036617e9cec0c9705d0 (diff) | |
| parent | 709e1c91ea7a5bbf2b9a104642572ca7616b224f (diff) | |
| download | ffmpeg-0ba65c9f795a1d3ad842f6d3179472e35c73541c.tar.gz | |
Merge commit '709e1c91ea7a5bbf2b9a104642572ca7616b224f'
* commit '709e1c91ea7a5bbf2b9a104642572ca7616b224f':
avprobe: Print the display matrix from per-stream sidedata
Conflicts:
avprobe.c
See: 08152f2df2c894dea22960572fe0bd9157cb52a4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/opengl_enc.c')
0 files changed, 0 insertions, 0 deletions