diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 12:11:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 12:11:10 +0200 |
| commit | 8d4460f1bbe94e02382594cee8dbb3e8ad2f9f32 (patch) | |
| tree | ceb392bebf690c47c2d9fde9f9a6f49f99fe6fa0 /libavcodec/hevc_parse.c | |
| parent | 7c502935ec6bfdbb474c4fe90617e45e639755ec (diff) | |
| parent | 8fcd121b823caeadbe7597c9ae9229f6f164f949 (diff) | |
| download | ffmpeg-8d4460f1bbe94e02382594cee8dbb3e8ad2f9f32.tar.gz | |
Merge commit '8fcd121b823caeadbe7597c9ae9229f6f164f949'
* commit '8fcd121b823caeadbe7597c9ae9229f6f164f949':
doc: Use the succinct syntax for the channelmap example
Conflicts:
doc/filters.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc_parse.c')
0 files changed, 0 insertions, 0 deletions