diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 04:19:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 04:50:00 +0200 |
| commit | 1d4194e69696e615b5bbf7273103b05241dc75b8 (patch) | |
| tree | 4684f6e817a8314e882fa6a73c89fa2e5f9f3798 /libavformat/ftp.c | |
| parent | c11810166205bbf68f114414329e679b0d2d5268 (diff) | |
| parent | fd124d8357b1becfde3ac8d5e3320127cf97a5b7 (diff) | |
| download | ffmpeg-1d4194e69696e615b5bbf7273103b05241dc75b8.tar.gz | |
Merge commit 'fd124d8357b1becfde3ac8d5e3320127cf97a5b7'
* commit 'fd124d8357b1becfde3ac8d5e3320127cf97a5b7':
hevc_ps: split the code for parsing the SPS and exporting it into the context
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ftp.c')
0 files changed, 0 insertions, 0 deletions