diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-03 22:16:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-03 22:16:10 +0200 |
| commit | 235863463abcfda0e428bf1a79009316b2dd7895 (patch) | |
| tree | d80957807fc0675407ceca1a509c6077bed2512c /libavcodec/cga_data.c | |
| parent | 41dde62d7f4121495150fe0e0db26fc25c737901 (diff) | |
| parent | df528b11ac607de13a7c438f2a51f2119f71a03c (diff) | |
| download | ffmpeg-235863463abcfda0e428bf1a79009316b2dd7895.tar.gz | |
Merge commit 'df528b11ac607de13a7c438f2a51f2119f71a03c'
* commit 'df528b11ac607de13a7c438f2a51f2119f71a03c':
hevc: make sure no dangling pointers remain around on VPS/SPS change
Conflicts:
libavcodec/hevc_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cga_data.c')
0 files changed, 0 insertions, 0 deletions