Merge commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Apr 2015 19:37:03 +0000 (21:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Apr 2015 19:37:03 +0000 (21:37 +0200)
commit41dde62d7f4121495150fe0e0db26fc25c737901
treed4d3ec545abb4268eab0a5ed2aec661b6d62330c
parentd386a523aefe2fed880b5e7d20929e1f65a6e138
parentce0bc09ee2580d49fec90a6eb0de2ba1b580c854
Merge commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854'

* commit 'ce0bc09ee2580d49fec90a6eb0de2ba1b580c854':
  hevc: do not change the VPS if its contents are the same

Conflicts:
libavcodec/hevc_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc_ps.c