diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 00:15:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 00:15:49 +0100 |
| commit | 0707a34dd8173deee141762c68bd8cf845abe610 (patch) | |
| tree | ca66e185b23c8ae1b9640a0ab3c809394427f950 /libavcodec/tableprint.h | |
| parent | b7c1f6f9cc752d3a29f7a14c09c15c884bf5f4e4 (diff) | |
| parent | d67dbfa7c195fabce706ca03c439419450f9bd8a (diff) | |
| download | ffmpeg-0707a34dd8173deee141762c68bd8cf845abe610.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx265: Support API version 9
See: 69ead9af7519796eebbc452fbbdb43af8d846173
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/tableprint.h')
0 files changed, 0 insertions, 0 deletions