diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-13 17:04:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-13 17:04:13 +0200 |
| commit | 5be07d0206916bf9119e5f4255c528aac1621406 (patch) | |
| tree | 943896002a30ce776515e4d2693062e70f2f008c /ffserver_config.c | |
| parent | 1127b35ff100983dc15d5b0929c98554afed8300 (diff) | |
| parent | a062a55d37720abc8c704aa0e8682efd3cdc9c9b (diff) | |
| download | ffmpeg-5be07d0206916bf9119e5f4255c528aac1621406.tar.gz | |
Merge commit 'a062a55d37720abc8c704aa0e8682efd3cdc9c9b'
* commit 'a062a55d37720abc8c704aa0e8682efd3cdc9c9b':
hevc_parser: fix standalone build with the hevc decoder disabled
Conflicts:
libavcodec/Makefile
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'ffserver_config.c')
0 files changed, 0 insertions, 0 deletions