diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-17 13:34:51 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-17 13:34:51 +0100 |
| commit | b77061b5caceb07b4487a08e48f78a5b24c15959 (patch) | |
| tree | 8209bd4dfbf170f600b6115571bfccf0d9515dfc /libavcodec/bmp_parser.c | |
| parent | d6322710c5ec51086aefef9037311922c7aa646c (diff) | |
| parent | 732a37d1466d45b3812509d68c82e783530e291a (diff) | |
| download | ffmpeg-b77061b5caceb07b4487a08e48f78a5b24c15959.tar.gz | |
Merge commit '732a37d1466d45b3812509d68c82e783530e291a'
* commit '732a37d1466d45b3812509d68c82e783530e291a':
libx264: export CPB props side data
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/bmp_parser.c')
0 files changed, 0 insertions, 0 deletions