[FFmpeg-cvslog] Merge commit 'df528b11ac607de13a7c438f2a51f2119f71a03c'

Michael Niedermayer git at videolan.org
Fri Apr 3 22:23:38 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr  3 22:16:10 2015 +0200| [235863463abcfda0e428bf1a79009316b2dd7895] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=235863463abcfda0e428bf1a79009316b2dd7895
---





More information about the ffmpeg-cvslog mailing list