diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-14 01:23:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-14 01:23:39 +0200 |
| commit | e17a459af06e222a04b98d1ef59b12e408f061e5 (patch) | |
| tree | afc801b39de3147df7e0002d472b167acc36361d /libavcodec/adpcm.h | |
| parent | db1ab7e5af6aeafb04db153828a266d1d998a78e (diff) | |
| parent | 8e373fe048812a25b238ea60a7052b8c07639a42 (diff) | |
| download | ffmpeg-e17a459af06e222a04b98d1ef59b12e408f061e5.tar.gz | |
Merge commit '8e373fe048812a25b238ea60a7052b8c07639a42'
* commit '8e373fe048812a25b238ea60a7052b8c07639a42':
hevc: Factor out the pixel format mapping from the sps parser
Conflicts:
libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/adpcm.h')
0 files changed, 0 insertions, 0 deletions