diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-03 21:11:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-03 21:11:19 +0200 |
| commit | a7a6194ec4103656bfdeac4616753dde23819a14 (patch) | |
| tree | 9c2afa509df4b59a95a2b86486f4adfc9ba97c73 /libavcodec/x86 | |
| parent | 5b97681eaa5aed5103519deed4a706b89a910746 (diff) | |
| parent | 1ae7afd256f9af1eb4f63f9adcf03d581ce4e2b5 (diff) | |
| download | ffmpeg-a7a6194ec4103656bfdeac4616753dde23819a14.tar.gz | |
Merge commit '1ae7afd256f9af1eb4f63f9adcf03d581ce4e2b5'
* commit '1ae7afd256f9af1eb4f63f9adcf03d581ce4e2b5':
hevc: split out setting AVCodecContext parameters
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
0 files changed, 0 insertions, 0 deletions