Merge commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 20:15:55 +0000 (21:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 20:16:33 +0000 (21:16 +0100)
* commit 'ed06e5d92b4c67b49068d538461fbbe0a53a8c5e':
  hevc: Do not turn 32bit timebases into negative numbers

Conflicts:
libavcodec/hevc.c

See: bf2ce19e51fde57727a4ee33a4b3c2622f37a5c4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/hevc.c

Simple merge