Merge commit 'ca2c9d6b9bfadb64e1502594fdf745a391699890' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 10:39:46 +0000 (11:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 10:39:46 +0000 (11:39 +0100)
commit0adde39e048868e1b3e2f7c94c4d47f45f5438f9
treec95592e71cc3abce710bb1a9ed58fe8711e2a343
parent03ae616b194e873ce22cef1878666b9d3028e56f
parentca2c9d6b9bfadb64e1502594fdf745a391699890
Merge commit 'ca2c9d6b9bfadb64e1502594fdf745a391699890' into release/2.2

* commit 'ca2c9d6b9bfadb64e1502594fdf745a391699890':
  hevc: make pps/sps ids unsigned where necessary

Conflicts:
libavcodec/hevc.h
libavcodec/hevc_ps.c

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