diff options
| author | Michael Niedermayer <[email protected]> | 2014-11-17 11:30:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-11-17 11:30:41 +0100 |
| commit | c192be196839ae28a55b37a01209bc052b8fdbe3 (patch) | |
| tree | 6ceb892b04862b5e98ebf55454fcc369bc0bf206 /libavcodec/bmp_parser.c | |
| parent | e7fdfbdc58bd5c9c30c612ae12b4f9fd8ad13d17 (diff) | |
| parent | 16c01fb4347312b6d29a6498dad627665b96a20e (diff) | |
Merge commit '16c01fb4347312b6d29a6498dad627665b96a20e'
* commit '16c01fb4347312b6d29a6498dad627665b96a20e':
hevc: remove an unused function parameter
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/bmp_parser.c')
0 files changed, 0 insertions, 0 deletions