diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-13 16:50:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-13 16:50:06 +0200 |
| commit | 1127b35ff100983dc15d5b0929c98554afed8300 (patch) | |
| tree | 101c402ea913b21021a6e6001b9f138ed5c527a7 /ffserver_config.c | |
| parent | afa97144cff837bbe2ecce47e79321373a82cb94 (diff) | |
| parent | b9f76d19d81fbc7f088536f966c2d3dc23c34ddc (diff) | |
| download | ffmpeg-1127b35ff100983dc15d5b0929c98554afed8300.tar.gz | |
Merge commit 'b9f76d19d81fbc7f088536f966c2d3dc23c34ddc'
* commit 'b9f76d19d81fbc7f088536f966c2d3dc23c34ddc':
hevc_ps: make sure failing to decode an SPS always returns an error
Conflicts:
libavcodec/hevc_ps.c
See: 15893adbdb6a7000f59207bcb88def6e7b4812b9
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'ffserver_config.c')
0 files changed, 0 insertions, 0 deletions